| Index: webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
|
| diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
|
| index 395836106c5225effd6d48c18ed92a90d2baf556..152f10f4d85d46eb6e2debd29dc4a7162c844aba 100644
|
| --- a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
|
| +++ b/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
|
| @@ -299,7 +299,7 @@ void RtcEventLogTestHelper::VerifyVideoSendStreamConfig(
|
| void RtcEventLogTestHelper::VerifyAudioReceiveStreamConfig(
|
| const ParsedRtcEventLog& parsed_log,
|
| size_t index,
|
| - const AudioReceiveStream::Config& config) {
|
| + const rtclog::StreamConfig& config) {
|
| const rtclog::Event& event = parsed_log.events_[index];
|
| ASSERT_TRUE(IsValidBasicEvent(event));
|
| ASSERT_EQ(rtclog::Event::AUDIO_RECEIVER_CONFIG_EVENT, event.type());
|
| @@ -307,32 +307,32 @@ void RtcEventLogTestHelper::VerifyAudioReceiveStreamConfig(
|
| event.audio_receiver_config();
|
| // Check SSRCs.
|
| ASSERT_TRUE(receiver_config.has_remote_ssrc());
|
| - EXPECT_EQ(config.rtp.remote_ssrc, receiver_config.remote_ssrc());
|
| + EXPECT_EQ(config.remote_ssrc, receiver_config.remote_ssrc());
|
| ASSERT_TRUE(receiver_config.has_local_ssrc());
|
| - EXPECT_EQ(config.rtp.local_ssrc, receiver_config.local_ssrc());
|
| + EXPECT_EQ(config.local_ssrc, receiver_config.local_ssrc());
|
| // Check header extensions.
|
| - ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()),
|
| + ASSERT_EQ(static_cast<int>(config.rtp_extensions.size()),
|
| receiver_config.header_extensions_size());
|
| for (int i = 0; i < receiver_config.header_extensions_size(); i++) {
|
| ASSERT_TRUE(receiver_config.header_extensions(i).has_name());
|
| ASSERT_TRUE(receiver_config.header_extensions(i).has_id());
|
| const std::string& name = receiver_config.header_extensions(i).name();
|
| int id = receiver_config.header_extensions(i).id();
|
| - EXPECT_EQ(config.rtp.extensions[i].id, id);
|
| - EXPECT_EQ(config.rtp.extensions[i].uri, name);
|
| + EXPECT_EQ(config.rtp_extensions[i].id, id);
|
| + EXPECT_EQ(config.rtp_extensions[i].uri, name);
|
| }
|
|
|
| // Check consistency of the parser.
|
| - AudioReceiveStream::Config parsed_config;
|
| + rtclog::StreamConfig parsed_config;
|
| parsed_log.GetAudioReceiveConfig(index, &parsed_config);
|
| - EXPECT_EQ(config.rtp.remote_ssrc, parsed_config.rtp.remote_ssrc);
|
| - EXPECT_EQ(config.rtp.local_ssrc, parsed_config.rtp.local_ssrc);
|
| + EXPECT_EQ(config.remote_ssrc, parsed_config.remote_ssrc);
|
| + EXPECT_EQ(config.local_ssrc, parsed_config.local_ssrc);
|
| // Check header extensions.
|
| - EXPECT_EQ(config.rtp.extensions.size(), parsed_config.rtp.extensions.size());
|
| - for (size_t i = 0; i < parsed_config.rtp.extensions.size(); i++) {
|
| - EXPECT_EQ(config.rtp.extensions[i].uri,
|
| - parsed_config.rtp.extensions[i].uri);
|
| - EXPECT_EQ(config.rtp.extensions[i].id, parsed_config.rtp.extensions[i].id);
|
| + EXPECT_EQ(config.rtp_extensions.size(), parsed_config.rtp_extensions.size());
|
| + for (size_t i = 0; i < parsed_config.rtp_extensions.size(); i++) {
|
| + EXPECT_EQ(config.rtp_extensions[i].uri,
|
| + parsed_config.rtp_extensions[i].uri);
|
| + EXPECT_EQ(config.rtp_extensions[i].id, parsed_config.rtp_extensions[i].id);
|
| }
|
| }
|
|
|
|
|