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

Side by Side Diff: webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc

Issue 2353543003: Added logging for audio send/receive stream configs. (Closed)
Patch Set: Another rebase. Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 if ((type == rtclog::Event::AUDIO_SENDER_CONFIG_EVENT) != 95 if ((type == rtclog::Event::AUDIO_SENDER_CONFIG_EVENT) !=
96 event.has_audio_sender_config()) { 96 event.has_audio_sender_config()) {
97 return ::testing::AssertionFailure() 97 return ::testing::AssertionFailure()
98 << "Event of type " << type << " has " 98 << "Event of type " << type << " has "
99 << (event.has_audio_sender_config() ? "" : "no ") 99 << (event.has_audio_sender_config() ? "" : "no ")
100 << "audio sender config"; 100 << "audio sender config";
101 } 101 }
102 return ::testing::AssertionSuccess(); 102 return ::testing::AssertionSuccess();
103 } 103 }
104 104
105 void RtcEventLogTestHelper::VerifyReceiveStreamConfig( 105 void RtcEventLogTestHelper::VerifyVideoReceiveStreamConfig(
106 const ParsedRtcEventLog& parsed_log, 106 const ParsedRtcEventLog& parsed_log,
107 size_t index, 107 size_t index,
108 const VideoReceiveStream::Config& config) { 108 const VideoReceiveStream::Config& config) {
109 const rtclog::Event& event = parsed_log.events_[index]; 109 const rtclog::Event& event = parsed_log.events_[index];
110 ASSERT_TRUE(IsValidBasicEvent(event)); 110 ASSERT_TRUE(IsValidBasicEvent(event));
111 ASSERT_EQ(rtclog::Event::VIDEO_RECEIVER_CONFIG_EVENT, event.type()); 111 ASSERT_EQ(rtclog::Event::VIDEO_RECEIVER_CONFIG_EVENT, event.type());
112 const rtclog::VideoReceiveConfig& receiver_config = 112 const rtclog::VideoReceiveConfig& receiver_config =
113 event.video_receiver_config(); 113 event.video_receiver_config();
114 // Check SSRCs. 114 // Check SSRCs.
115 ASSERT_TRUE(receiver_config.has_remote_ssrc()); 115 ASSERT_TRUE(receiver_config.has_remote_ssrc());
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 // Check decoders. 191 // Check decoders.
192 EXPECT_EQ(config.decoders.size(), parsed_config.decoders.size()); 192 EXPECT_EQ(config.decoders.size(), parsed_config.decoders.size());
193 for (size_t i = 0; i < parsed_config.decoders.size(); i++) { 193 for (size_t i = 0; i < parsed_config.decoders.size(); i++) {
194 EXPECT_EQ(config.decoders[i].payload_name, 194 EXPECT_EQ(config.decoders[i].payload_name,
195 parsed_config.decoders[i].payload_name); 195 parsed_config.decoders[i].payload_name);
196 EXPECT_EQ(config.decoders[i].payload_type, 196 EXPECT_EQ(config.decoders[i].payload_type,
197 parsed_config.decoders[i].payload_type); 197 parsed_config.decoders[i].payload_type);
198 } 198 }
199 } 199 }
200 200
201 void RtcEventLogTestHelper::VerifySendStreamConfig( 201 void RtcEventLogTestHelper::VerifyVideoSendStreamConfig(
202 const ParsedRtcEventLog& parsed_log, 202 const ParsedRtcEventLog& parsed_log,
203 size_t index, 203 size_t index,
204 const VideoSendStream::Config& config) { 204 const VideoSendStream::Config& config) {
205 const rtclog::Event& event = parsed_log.events_[index]; 205 const rtclog::Event& event = parsed_log.events_[index];
206 ASSERT_TRUE(IsValidBasicEvent(event)); 206 ASSERT_TRUE(IsValidBasicEvent(event));
207 ASSERT_EQ(rtclog::Event::VIDEO_SENDER_CONFIG_EVENT, event.type()); 207 ASSERT_EQ(rtclog::Event::VIDEO_SENDER_CONFIG_EVENT, event.type());
208 const rtclog::VideoSendConfig& sender_config = event.video_sender_config(); 208 const rtclog::VideoSendConfig& sender_config = event.video_sender_config();
209 // Check SSRCs. 209 // Check SSRCs.
210 ASSERT_EQ(static_cast<int>(config.rtp.ssrcs.size()), 210 ASSERT_EQ(static_cast<int>(config.rtp.ssrcs.size()),
211 sender_config.ssrcs_size()); 211 sender_config.ssrcs_size());
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 EXPECT_EQ(config.rtp.rtx.ssrcs[i], parsed_config.rtp.rtx.ssrcs[i]); 263 EXPECT_EQ(config.rtp.rtx.ssrcs[i], parsed_config.rtp.rtx.ssrcs[i]);
264 } 264 }
265 EXPECT_EQ(config.rtp.rtx.payload_type, parsed_config.rtp.rtx.payload_type); 265 EXPECT_EQ(config.rtp.rtx.payload_type, parsed_config.rtp.rtx.payload_type);
266 // Check encoder. 266 // Check encoder.
267 EXPECT_EQ(config.encoder_settings.payload_name, 267 EXPECT_EQ(config.encoder_settings.payload_name,
268 parsed_config.encoder_settings.payload_name); 268 parsed_config.encoder_settings.payload_name);
269 EXPECT_EQ(config.encoder_settings.payload_type, 269 EXPECT_EQ(config.encoder_settings.payload_type,
270 parsed_config.encoder_settings.payload_type); 270 parsed_config.encoder_settings.payload_type);
271 } 271 }
272 272
273 void RtcEventLogTestHelper::VerifyAudioReceiveStreamConfig(
274 const ParsedRtcEventLog& parsed_log,
275 size_t index,
276 const AudioReceiveStream::Config& config) {
277 const rtclog::Event& event = parsed_log.events_[index];
278 ASSERT_TRUE(IsValidBasicEvent(event));
279 ASSERT_EQ(rtclog::Event::AUDIO_RECEIVER_CONFIG_EVENT, event.type());
280 const rtclog::AudioReceiveConfig& receiver_config =
281 event.audio_receiver_config();
282 // Check SSRCs.
283 ASSERT_TRUE(receiver_config.has_remote_ssrc());
284 EXPECT_EQ(config.rtp.remote_ssrc, receiver_config.remote_ssrc());
285 ASSERT_TRUE(receiver_config.has_local_ssrc());
286 EXPECT_EQ(config.rtp.local_ssrc, receiver_config.local_ssrc());
287 // Check header extensions.
288 ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()),
289 receiver_config.header_extensions_size());
290 for (int i = 0; i < receiver_config.header_extensions_size(); i++) {
291 ASSERT_TRUE(receiver_config.header_extensions(i).has_name());
292 ASSERT_TRUE(receiver_config.header_extensions(i).has_id());
293 const std::string& name = receiver_config.header_extensions(i).name();
294 int id = receiver_config.header_extensions(i).id();
295 EXPECT_EQ(config.rtp.extensions[i].id, id);
296 EXPECT_EQ(config.rtp.extensions[i].uri, name);
297 }
298
299 // Check consistency of the parser.
300 AudioReceiveStream::Config parsed_config;
301 parsed_log.GetAudioReceiveConfig(index, &parsed_config);
302 EXPECT_EQ(config.rtp.remote_ssrc, parsed_config.rtp.remote_ssrc);
303 EXPECT_EQ(config.rtp.local_ssrc, parsed_config.rtp.local_ssrc);
304 // Check header extensions.
305 EXPECT_EQ(config.rtp.extensions.size(), parsed_config.rtp.extensions.size());
306 for (size_t i = 0; i < parsed_config.rtp.extensions.size(); i++) {
307 EXPECT_EQ(config.rtp.extensions[i].uri,
308 parsed_config.rtp.extensions[i].uri);
309 EXPECT_EQ(config.rtp.extensions[i].id, parsed_config.rtp.extensions[i].id);
310 }
311 }
312
313 void RtcEventLogTestHelper::VerifyAudioSendStreamConfig(
314 const ParsedRtcEventLog& parsed_log,
315 size_t index,
316 const AudioSendStream::Config& config) {
317 const rtclog::Event& event = parsed_log.events_[index];
318 ASSERT_TRUE(IsValidBasicEvent(event));
319 ASSERT_EQ(rtclog::Event::AUDIO_SENDER_CONFIG_EVENT, event.type());
320 const rtclog::AudioSendConfig& sender_config = event.audio_sender_config();
321 // Check SSRCs.
322 EXPECT_EQ(config.rtp.ssrc, sender_config.ssrc());
323 // Check header extensions.
324 ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()),
325 sender_config.header_extensions_size());
326 for (int i = 0; i < sender_config.header_extensions_size(); i++) {
327 ASSERT_TRUE(sender_config.header_extensions(i).has_name());
328 ASSERT_TRUE(sender_config.header_extensions(i).has_id());
329 const std::string& name = sender_config.header_extensions(i).name();
330 int id = sender_config.header_extensions(i).id();
331 EXPECT_EQ(config.rtp.extensions[i].id, id);
332 EXPECT_EQ(config.rtp.extensions[i].uri, name);
333 }
334
335 // Check consistency of the parser.
336 AudioSendStream::Config parsed_config(nullptr);
337 parsed_log.GetAudioSendConfig(index, &parsed_config);
338 // Check SSRCs
339 EXPECT_EQ(config.rtp.ssrc, parsed_config.rtp.ssrc);
340 // Check header extensions.
341 EXPECT_EQ(config.rtp.extensions.size(), parsed_config.rtp.extensions.size());
342 for (size_t i = 0; i < parsed_config.rtp.extensions.size(); i++) {
343 EXPECT_EQ(config.rtp.extensions[i].uri,
344 parsed_config.rtp.extensions[i].uri);
345 EXPECT_EQ(config.rtp.extensions[i].id, parsed_config.rtp.extensions[i].id);
346 }
347 }
348
273 void RtcEventLogTestHelper::VerifyRtpEvent(const ParsedRtcEventLog& parsed_log, 349 void RtcEventLogTestHelper::VerifyRtpEvent(const ParsedRtcEventLog& parsed_log,
274 size_t index, 350 size_t index,
275 PacketDirection direction, 351 PacketDirection direction,
276 MediaType media_type, 352 MediaType media_type,
277 const uint8_t* header, 353 const uint8_t* header,
278 size_t header_size, 354 size_t header_size,
279 size_t total_size) { 355 size_t total_size) {
280 const rtclog::Event& event = parsed_log.events_[index]; 356 const rtclog::Event& event = parsed_log.events_[index];
281 ASSERT_TRUE(IsValidBasicEvent(event)); 357 ASSERT_TRUE(IsValidBasicEvent(event));
282 ASSERT_EQ(rtclog::Event::RTP_EVENT, event.type()); 358 ASSERT_EQ(rtclog::Event::RTP_EVENT, event.type());
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 472
397 void RtcEventLogTestHelper::VerifyLogEndEvent( 473 void RtcEventLogTestHelper::VerifyLogEndEvent(
398 const ParsedRtcEventLog& parsed_log, 474 const ParsedRtcEventLog& parsed_log,
399 size_t index) { 475 size_t index) {
400 const rtclog::Event& event = parsed_log.events_[index]; 476 const rtclog::Event& event = parsed_log.events_[index];
401 ASSERT_TRUE(IsValidBasicEvent(event)); 477 ASSERT_TRUE(IsValidBasicEvent(event));
402 EXPECT_EQ(rtclog::Event::LOG_END, event.type()); 478 EXPECT_EQ(rtclog::Event::LOG_END, event.type());
403 } 479 }
404 480
405 } // namespace webrtc 481 } // namespace webrtc
OLDNEW
« 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