Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/test/utility/default_config.cc

Index: media/cast/test/utility/default_config.cc
diff --git a/media/cast/test/utility/default_config.cc b/media/cast/test/utility/default_config.cc
index 7d8b08128a4c2276c759a1e57dac200328434300..ca6af8d1b0e96749644aa73cf77441f7e2c020de 100644
--- a/media/cast/test/utility/default_config.cc
+++ b/media/cast/test/utility/default_config.cc
@@ -34,7 +34,7 @@ FrameReceiverConfig GetDefaultAudioReceiverConfig() {
   config.receiver_ssrc = 2;
   config.sender_ssrc = 1;
   config.rtp_max_delay_ms = kDefaultRtpMaxDelayMs;
-  config.rtp_payload_type = kDefaultRtpAudioPayloadType;
+  config.rtp_payload_type = RtpPayloadType::AUDIO_OPUS;
   config.rtp_timebase = 48000;
   config.channels = 2;
   config.target_frame_rate = 100;  // 10ms of signal per frame
@@ -47,7 +47,7 @@ FrameReceiverConfig GetDefaultVideoReceiverConfig() {
   config.receiver_ssrc = 12;
   config.sender_ssrc = 11;
   config.rtp_max_delay_ms = kDefaultRtpMaxDelayMs;
-  config.rtp_payload_type = kDefaultRtpVideoPayloadType;
+  config.rtp_payload_type = RtpPayloadType::VIDEO_VP8;
   config.rtp_timebase = kVideoFrequency;
   config.channels = 1;
   config.target_frame_rate = kDefaultMaxFrameRate;
@@ -55,38 +55,43 @@ FrameReceiverConfig GetDefaultVideoReceiverConfig() {
   return config;
 }
 
-AudioSenderConfig GetDefaultAudioSenderConfig() {
+FrameSenderConfig GetDefaultAudioSenderConfig() {
   FrameReceiverConfig recv_config = GetDefaultAudioReceiverConfig();
-  AudioSenderConfig config;
-  config.ssrc = recv_config.sender_ssrc;
+  FrameSenderConfig config;
+  config.sender_ssrc = recv_config.sender_ssrc;
   config.receiver_ssrc = recv_config.receiver_ssrc;
   config.rtp_payload_type = recv_config.rtp_payload_type;
   config.use_external_encoder = false;
   config.frequency = recv_config.rtp_timebase;
   config.channels = recv_config.channels;
-  config.bitrate = kDefaultAudioEncoderBitrate;
+  config.max_bitrate = config.min_bitrate = kDefaultAudioEncoderBitrate;
   config.codec = recv_config.codec;
   config.max_playout_delay =
       base::TimeDelta::FromMilliseconds(kDefaultRtpMaxDelayMs);
   return config;
 }
 
-VideoSenderConfig GetDefaultVideoSenderConfig() {
+FrameSenderConfig GetDefaultVideoSenderConfig() {
   FrameReceiverConfig recv_config = GetDefaultVideoReceiverConfig();
-  VideoSenderConfig config;
-  config.ssrc = recv_config.sender_ssrc;
+  FrameSenderConfig config;
+  config.sender_ssrc = recv_config.sender_ssrc;
   config.receiver_ssrc = recv_config.receiver_ssrc;
   config.rtp_payload_type = recv_config.rtp_payload_type;
   config.use_external_encoder = false;
-  config.max_bitrate = 4000000;
-  config.min_bitrate = 2000000;
-  config.start_bitrate = 4000000;
-  config.max_frame_rate = recv_config.target_frame_rate;
-  config.max_number_of_video_buffers_used = 1;
-  config.codec = recv_config.codec;
-  config.number_of_encode_threads = 2;
+  config.frequency = recv_config.rtp_timebase;
+  config.max_bitrate = kDefaultMaxVideoKbps * 1000;
+  config.min_bitrate = kDefaultMinVideoKbps * 1000;
   config.max_playout_delay =
       base::TimeDelta::FromMilliseconds(kDefaultRtpMaxDelayMs);
+  config.codec = recv_config.codec;
+  config.codec_specific_params.start_bitrate = config.max_bitrate;
+  config.max_frame_rate = recv_config.target_frame_rate;
+  config.codec_specific_params.max_number_of_video_buffers_used =
+      kDefaultNumberOfVideoBuffers;
+  config.codec_specific_params.number_of_encode_threads = 1;

[miu, 2016/06/30 21:59:43]

This was "2" before. Did you mean to change it?

[xjz, 2016/07/01 23:52:09]

Oh, no. Changed it back to 2.

+  config.codec_specific_params.max_qp = kDefaultMaxQp;
+  config.codec_specific_params.min_qp = kDefaultMinQp;
+  config.codec_specific_params.max_cpu_saver_qp = kDefaultMaxCpuSaverQp;
   return config;
 }