Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/test/end2end_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This test generate synthetic data. For audio it's a sinusoid waveform with
 // frequency kSoundFrequency and different amplitudes. For video it's a pattern
 // that is shifting by one pixel per frame, each pixels neighbors right and down
 // is this pixels value +1, since the pixel value is 8 bit it will wrap
 // frequently within the image. Visually this will create diagonally color bands
 // that moves across the screen
@@ skipping 414 matching lines @@
         receiver_to_sender_(new LoopBackTransport(cast_environment_receiver_)),
         sender_to_receiver_(new LoopBackTransport(cast_environment_sender_)),
         test_receiver_audio_callback_(new TestReceiverAudioCallback()),
         test_receiver_video_callback_(new TestReceiverVideoCallback()) {
     testing_clock_.Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
     cast_environment_sender_->logger()->Subscribe(&event_subscriber_sender_);
   }
 
   void Configure(Codec video_codec, Codec audio_codec) {
-    audio_sender_config_.ssrc = 1;
+    audio_sender_config_.sender_ssrc = 1;
     audio_sender_config_.receiver_ssrc = 2;
     audio_sender_config_.max_playout_delay =
         base::TimeDelta::FromMilliseconds(kTargetPlayoutDelayMs);
-    audio_sender_config_.rtp_payload_type = 96;
+    audio_sender_config_.rtp_payload_type = RtpPayloadType::AUDIO_OPUS;
     audio_sender_config_.use_external_encoder = false;
     audio_sender_config_.frequency = kDefaultAudioSamplingRate;
     audio_sender_config_.channels = kAudioChannels;
-    audio_sender_config_.bitrate = kDefaultAudioEncoderBitrate;
+    audio_sender_config_.max_bitrate = kDefaultAudioEncoderBitrate;
     audio_sender_config_.codec = audio_codec;
     audio_sender_config_.aes_iv_mask =
         ConvertFromBase16String("abcdeffedcba12345678900987654321");
     audio_sender_config_.aes_key =
         ConvertFromBase16String("deadbeefcafecafedeadbeefb0b0b0b0");
 
     audio_receiver_config_.receiver_ssrc =
         audio_sender_config_.receiver_ssrc;
-    audio_receiver_config_.sender_ssrc = audio_sender_config_.ssrc;
+    audio_receiver_config_.sender_ssrc = audio_sender_config_.sender_ssrc;
     audio_receiver_config_.rtp_max_delay_ms = kTargetPlayoutDelayMs;
     audio_receiver_config_.rtp_payload_type =
         audio_sender_config_.rtp_payload_type;
     audio_receiver_config_.rtp_timebase = audio_sender_config_.frequency;
     audio_receiver_config_.channels = kAudioChannels;
     audio_receiver_config_.target_frame_rate = 100;
     audio_receiver_config_.codec = audio_sender_config_.codec;
     audio_receiver_config_.aes_iv_mask = audio_sender_config_.aes_iv_mask;
     audio_receiver_config_.aes_key = audio_sender_config_.aes_key;
 
     test_receiver_audio_callback_->SetExpectedSamplingFrequency(
         audio_receiver_config_.rtp_timebase);
 
-    video_sender_config_.ssrc = 3;
+    video_sender_config_.sender_ssrc = 3;
     video_sender_config_.receiver_ssrc = 4;
     video_sender_config_.max_playout_delay =
         base::TimeDelta::FromMilliseconds(kTargetPlayoutDelayMs);
-    video_sender_config_.rtp_payload_type = 97;
+    video_sender_config_.rtp_payload_type = RtpPayloadType::VIDEO_VP8;
     video_sender_config_.use_external_encoder = false;
     video_sender_config_.max_bitrate = 50000;
     video_sender_config_.min_bitrate = 10000;
-    video_sender_config_.start_bitrate = 10000;
-    video_sender_config_.max_qp = 30;
-    video_sender_config_.min_qp = 4;
+    video_sender_config_.codec_specific_params.start_bitrate = 10000;
+    video_sender_config_.codec_specific_params.max_qp = 30;
+    video_sender_config_.codec_specific_params.min_qp = 4;
     video_sender_config_.max_frame_rate = 30;
     video_sender_config_.codec = video_codec;
     video_sender_config_.aes_iv_mask =
         ConvertFromBase16String("1234567890abcdeffedcba0987654321");
     video_sender_config_.aes_key =
         ConvertFromBase16String("deadbeefcafeb0b0b0b0cafedeadbeef");
 
     video_receiver_config_.receiver_ssrc =
         video_sender_config_.receiver_ssrc;
-    video_receiver_config_.sender_ssrc = video_sender_config_.ssrc;
+    video_receiver_config_.sender_ssrc = video_sender_config_.sender_ssrc;
     video_receiver_config_.rtp_max_delay_ms = kTargetPlayoutDelayMs;
     video_receiver_config_.rtp_payload_type =
         video_sender_config_.rtp_payload_type;
     video_receiver_config_.rtp_timebase = kVideoFrequency;
     video_receiver_config_.channels = 1;
     video_receiver_config_.target_frame_rate =
         video_sender_config_.max_frame_rate;

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

Now this is a double being assigned to an int-typed field. Did you want to
either: 1) Add round-to-nearest int; or 2) Change
FrameReceiverConfig::target_frame_rate to be a double type (which may or may not
trickle into a whole bunch more files)>

I'll leave it up to you how far you want to go in this change. ;-)

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

I changed the target_frame_rate to double too.

     video_receiver_config_.codec = video_sender_config_.codec;
     video_receiver_config_.aes_iv_mask = video_sender_config_.aes_iv_mask;
     video_receiver_config_.aes_key = video_sender_config_.aes_key;
   }
 
   void SetReceiverSkew(double skew, base::TimeDelta offset) {
     testing_clock_receiver_->SetSkew(skew, offset);
     task_runner_receiver_->SetSkew(1.0 / skew);
   }
 
@@ skipping 323 matching lines @@
     cast_receiver_->RequestDecodedVideoFrame(
         base::Bind(&End2EndTest::BasicPlayerGotVideoFrame,
                    base::Unretained(this)));
     cast_receiver_->RequestDecodedAudioFrame(
         base::Bind(&End2EndTest::BasicPlayerGotAudioFrame,
                    base::Unretained(this)));
   }
 
   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_;
 
   // These run in "test time"
   base::SimpleTestTickClock testing_clock_;
   scoped_refptr<FakeSingleThreadTaskRunner> task_runner_;
 
   // These run on the sender timeline.
   test::SkewedTickClock* testing_clock_sender_;
   scoped_refptr<test::SkewedSingleThreadTaskRunner> task_runner_sender_;
@@ skipping 422 matching lines @@
       EXPECT_EQ(0u, jump);
       jump = i;
     }
   }
   EXPECT_GT(jump, 49u);
   EXPECT_LT(jump, 120u);
 }
 
 }  // namespace cast
 }  // namespace media