Index: media/cast/test/end2end_unittest.cc |
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc |
index 56f8a1ba6477c90e85a82fdcf61674834fd95c2d..841db4476cc2b46e2cd58ae21d29ccd2edb42188 100644 |
--- a/media/cast/test/end2end_unittest.cc |
+++ b/media/cast/test/end2end_unittest.cc |
@@ -432,15 +432,15 @@ class End2EndTest : public ::testing::Test { |
} |
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"); |
@@ -449,7 +449,7 @@ class End2EndTest : public ::testing::Test { |
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; |
@@ -463,17 +463,17 @@ class End2EndTest : public ::testing::Test { |
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 = |
@@ -483,7 +483,7 @@ class End2EndTest : public ::testing::Test { |
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; |
@@ -834,8 +834,8 @@ class End2EndTest : public ::testing::Test { |
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_; |