Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/test/cast_benchmarks.cc

Index: media/cast/test/cast_benchmarks.cc
diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc
index c24785d0d32661bc6b9216c393cbfaf930322661..ac393e9d0c2c24501e688bc285ec0131ad3ac166 100644
--- a/media/cast/test/cast_benchmarks.cc
+++ b/media/cast/test/cast_benchmarks.cc
@@ -250,15 +250,16 @@ class RunOneBenchmark {
             base::TimeDelta::FromMilliseconds(kTargetPlayoutDelayMs);
     video_sender_config_.max_bitrate = 4000000;
     video_sender_config_.min_bitrate = 4000000;
-    video_sender_config_.start_bitrate = 4000000;
+    video_sender_config_.codec_specific_params.start_bitrate = 4000000;
     video_sender_config_.codec = video_codec;
 
     video_receiver_config_ = GetDefaultVideoReceiverConfig();
     video_receiver_config_.rtp_max_delay_ms = kTargetPlayoutDelayMs;
     video_receiver_config_.codec = video_codec;
 
-    frame_duration_ = base::TimeDelta::FromSeconds(1) /
-        video_sender_config_.max_frame_rate;
+    DCHECK_GT(video_sender_config_.max_frame_rate, 0);
+    frame_duration_ =
+        base::TimeDelta::FromSeconds(1) / video_sender_config_.max_frame_rate;

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

nit: base::TimeDelta::FromSecondsF(1.0 / video_sender_config_.max_frame_rate);

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

Done.

   }
 
   void SetSenderClockSkew(double skew, base::TimeDelta offset) {
@@ -285,7 +286,7 @@ class RunOneBenchmark {
 
   base::TimeDelta VideoTimestamp(int frame_number) {
     return (frame_number * base::TimeDelta::FromSeconds(1)) /
-        video_sender_config_.max_frame_rate;
+           video_sender_config_.max_frame_rate;

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

ditto: base::TimeDelta::FromSecondsF(1.0 / video_sender_config_.max_frame_rate);

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

Done.

   }
 
   void SendFakeVideoFrame() {
@@ -409,8 +410,8 @@ class RunOneBenchmark {
  private:
   FrameReceiverConfig audio_receiver_config_;
   FrameReceiverConfig video_receiver_config_;
-  AudioSenderConfig audio_sender_config_;
-  VideoSenderConfig video_sender_config_;
+  FrameSenderConfig audio_sender_config_;
+  FrameSenderConfig video_sender_config_;
 
   base::TimeTicks start_time_;