Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Unified Diff: webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc

Issue 2856063003: Replace AudioSendStream::Config with rtclog::StreamConfig. (Closed)
Patch Set: Rebased Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 152f10f4d85d46eb6e2debd29dc4a7162c844aba..8b4ea6bd0e43a5087a5bdb93a91adf101e865db4 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
@@ -339,37 +339,29 @@ void RtcEventLogTestHelper::VerifyAudioReceiveStreamConfig(
void RtcEventLogTestHelper::VerifyAudioSendStreamConfig(
const ParsedRtcEventLog& parsed_log,
size_t index,
- const AudioSendStream::Config& config) {
+ const rtclog::StreamConfig& config) {
const rtclog::Event& event = parsed_log.events_[index];
ASSERT_TRUE(IsValidBasicEvent(event));
ASSERT_EQ(rtclog::Event::AUDIO_SENDER_CONFIG_EVENT, event.type());
const rtclog::AudioSendConfig& sender_config = event.audio_sender_config();
// Check SSRCs.
- EXPECT_EQ(config.rtp.ssrc, sender_config.ssrc());
+ EXPECT_EQ(config.local_ssrc, sender_config.ssrc());
// Check header extensions.
- ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()),
+ ASSERT_EQ(static_cast<int>(config.rtp_extensions.size()),
sender_config.header_extensions_size());
for (int i = 0; i < sender_config.header_extensions_size(); i++) {
ASSERT_TRUE(sender_config.header_extensions(i).has_name());
ASSERT_TRUE(sender_config.header_extensions(i).has_id());
const std::string& name = sender_config.header_extensions(i).name();
int id = sender_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.
- AudioSendStream::Config parsed_config(nullptr);
+ rtclog::StreamConfig parsed_config;
parsed_log.GetAudioSendConfig(index, &parsed_config);
- // Check SSRCs
- EXPECT_EQ(config.rtp.ssrc, parsed_config.rtp.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);
- }
+ VerifyStreamConfigsAreEqual(config, parsed_config);
}
void RtcEventLogTestHelper::VerifyRtpEvent(const ParsedRtcEventLog& parsed_log,
« no previous file with comments | « webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.h ('k') | webrtc/tools/event_log_visualizer/analyzer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698