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

Side by Side Diff: webrtc/call/rtc_event_log_unittest.cc

Issue 1768773002: New parser for event log. Manually parse the outermost EventStream (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comments from ivoc Created 4 years, 8 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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
11 #ifdef ENABLE_RTC_EVENT_LOG 11 #ifdef ENABLE_RTC_EVENT_LOG
12 12
13 #include <memory> 13 #include <memory>
14 #include <string> 14 #include <string>
15 #include <utility> 15 #include <utility>
16 #include <vector> 16 #include <vector>
17 17
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 #include "webrtc/base/buffer.h" 19 #include "webrtc/base/buffer.h"
20 #include "webrtc/base/checks.h" 20 #include "webrtc/base/checks.h"
21 #include "webrtc/base/random.h" 21 #include "webrtc/base/random.h"
22 #include "webrtc/base/thread.h" 22 #include "webrtc/base/thread.h"
23 #include "webrtc/call.h" 23 #include "webrtc/call.h"
24 #include "webrtc/call/rtc_event_log.h" 24 #include "webrtc/call/rtc_event_log.h"
25 #include "webrtc/call/rtc_event_log_parser.h"
26 #include "webrtc/call/rtc_event_log_unittest_helper.h"
25 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" 27 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
26 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" 28 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
27 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" 29 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
28 #include "webrtc/system_wrappers/include/clock.h" 30 #include "webrtc/system_wrappers/include/clock.h"
29 #include "webrtc/test/test_suite.h" 31 #include "webrtc/test/test_suite.h"
30 #include "webrtc/test/testsupport/fileutils.h" 32 #include "webrtc/test/testsupport/fileutils.h"
31 33
32 // Files generated at build-time by the protobuf compiler. 34 // Files generated at build-time by the protobuf compiler.
33 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD 35 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
34 #include "external/webrtc/webrtc/call/rtc_event_log.pb.h" 36 #include "external/webrtc/webrtc/call/rtc_event_log.pb.h"
(...skipping 13 matching lines...) Expand all
48 RTPExtensionType::kRtpExtensionTransportSequenceNumber}; 50 RTPExtensionType::kRtpExtensionTransportSequenceNumber};
49 const char* kExtensionNames[] = {RtpExtension::kTOffset, 51 const char* kExtensionNames[] = {RtpExtension::kTOffset,
50 RtpExtension::kAudioLevel, 52 RtpExtension::kAudioLevel,
51 RtpExtension::kAbsSendTime, 53 RtpExtension::kAbsSendTime,
52 RtpExtension::kVideoRotation, 54 RtpExtension::kVideoRotation,
53 RtpExtension::kTransportSequenceNumber}; 55 RtpExtension::kTransportSequenceNumber};
54 const size_t kNumExtensions = 5; 56 const size_t kNumExtensions = 5;
55 57
56 } // namespace 58 } // namespace
57 59
58 // TODO(terelius): Place this definition with other parsing functions?
59 MediaType GetRuntimeMediaType(rtclog::MediaType media_type) {
60 switch (media_type) {
61 case rtclog::MediaType::ANY:
62 return MediaType::ANY;
63 case rtclog::MediaType::AUDIO:
64 return MediaType::AUDIO;
65 case rtclog::MediaType::VIDEO:
66 return MediaType::VIDEO;
67 case rtclog::MediaType::DATA:
68 return MediaType::DATA;
69 }
70 RTC_NOTREACHED();
71 return MediaType::ANY;
72 }
73
74 // Checks that the event has a timestamp, a type and exactly the data field
75 // corresponding to the type.
76 ::testing::AssertionResult IsValidBasicEvent(const rtclog::Event& event) {
77 if (!event.has_timestamp_us())
78 return ::testing::AssertionFailure() << "Event has no timestamp";
79 if (!event.has_type())
80 return ::testing::AssertionFailure() << "Event has no event type";
81 rtclog::Event_EventType type = event.type();
82 if ((type == rtclog::Event::RTP_EVENT) != event.has_rtp_packet())
83 return ::testing::AssertionFailure()
84 << "Event of type " << type << " has "
85 << (event.has_rtp_packet() ? "" : "no ") << "RTP packet";
86 if ((type == rtclog::Event::RTCP_EVENT) != event.has_rtcp_packet())
87 return ::testing::AssertionFailure()
88 << "Event of type " << type << " has "
89 << (event.has_rtcp_packet() ? "" : "no ") << "RTCP packet";
90 if ((type == rtclog::Event::AUDIO_PLAYOUT_EVENT) !=
91 event.has_audio_playout_event())
92 return ::testing::AssertionFailure()
93 << "Event of type " << type << " has "
94 << (event.has_audio_playout_event() ? "" : "no ")
95 << "audio_playout event";
96 if ((type == rtclog::Event::VIDEO_RECEIVER_CONFIG_EVENT) !=
97 event.has_video_receiver_config())
98 return ::testing::AssertionFailure()
99 << "Event of type " << type << " has "
100 << (event.has_video_receiver_config() ? "" : "no ")
101 << "receiver config";
102 if ((type == rtclog::Event::VIDEO_SENDER_CONFIG_EVENT) !=
103 event.has_video_sender_config())
104 return ::testing::AssertionFailure()
105 << "Event of type " << type << " has "
106 << (event.has_video_sender_config() ? "" : "no ") << "sender config";
107 if ((type == rtclog::Event::AUDIO_RECEIVER_CONFIG_EVENT) !=
108 event.has_audio_receiver_config()) {
109 return ::testing::AssertionFailure()
110 << "Event of type " << type << " has "
111 << (event.has_audio_receiver_config() ? "" : "no ")
112 << "audio receiver config";
113 }
114 if ((type == rtclog::Event::AUDIO_SENDER_CONFIG_EVENT) !=
115 event.has_audio_sender_config()) {
116 return ::testing::AssertionFailure()
117 << "Event of type " << type << " has "
118 << (event.has_audio_sender_config() ? "" : "no ")
119 << "audio sender config";
120 }
121 return ::testing::AssertionSuccess();
122 }
123
124 void VerifyReceiveStreamConfig(const rtclog::Event& event,
125 const VideoReceiveStream::Config& config) {
126 ASSERT_TRUE(IsValidBasicEvent(event));
127 ASSERT_EQ(rtclog::Event::VIDEO_RECEIVER_CONFIG_EVENT, event.type());
128 const rtclog::VideoReceiveConfig& receiver_config =
129 event.video_receiver_config();
130 // Check SSRCs.
131 ASSERT_TRUE(receiver_config.has_remote_ssrc());
132 EXPECT_EQ(config.rtp.remote_ssrc, receiver_config.remote_ssrc());
133 ASSERT_TRUE(receiver_config.has_local_ssrc());
134 EXPECT_EQ(config.rtp.local_ssrc, receiver_config.local_ssrc());
135 // Check RTCP settings.
136 ASSERT_TRUE(receiver_config.has_rtcp_mode());
137 if (config.rtp.rtcp_mode == RtcpMode::kCompound)
138 EXPECT_EQ(rtclog::VideoReceiveConfig::RTCP_COMPOUND,
139 receiver_config.rtcp_mode());
140 else
141 EXPECT_EQ(rtclog::VideoReceiveConfig::RTCP_REDUCEDSIZE,
142 receiver_config.rtcp_mode());
143 ASSERT_TRUE(receiver_config.has_remb());
144 EXPECT_EQ(config.rtp.remb, receiver_config.remb());
145 // Check RTX map.
146 ASSERT_EQ(static_cast<int>(config.rtp.rtx.size()),
147 receiver_config.rtx_map_size());
148 for (const rtclog::RtxMap& rtx_map : receiver_config.rtx_map()) {
149 ASSERT_TRUE(rtx_map.has_payload_type());
150 ASSERT_TRUE(rtx_map.has_config());
151 EXPECT_EQ(1u, config.rtp.rtx.count(rtx_map.payload_type()));
152 const rtclog::RtxConfig& rtx_config = rtx_map.config();
153 const VideoReceiveStream::Config::Rtp::Rtx& rtx =
154 config.rtp.rtx.at(rtx_map.payload_type());
155 ASSERT_TRUE(rtx_config.has_rtx_ssrc());
156 ASSERT_TRUE(rtx_config.has_rtx_payload_type());
157 EXPECT_EQ(rtx.ssrc, rtx_config.rtx_ssrc());
158 EXPECT_EQ(rtx.payload_type, rtx_config.rtx_payload_type());
159 }
160 // Check header extensions.
161 ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()),
162 receiver_config.header_extensions_size());
163 for (int i = 0; i < receiver_config.header_extensions_size(); i++) {
164 ASSERT_TRUE(receiver_config.header_extensions(i).has_name());
165 ASSERT_TRUE(receiver_config.header_extensions(i).has_id());
166 const std::string& name = receiver_config.header_extensions(i).name();
167 int id = receiver_config.header_extensions(i).id();
168 EXPECT_EQ(config.rtp.extensions[i].id, id);
169 EXPECT_EQ(config.rtp.extensions[i].name, name);
170 }
171 // Check decoders.
172 ASSERT_EQ(static_cast<int>(config.decoders.size()),
173 receiver_config.decoders_size());
174 for (int i = 0; i < receiver_config.decoders_size(); i++) {
175 ASSERT_TRUE(receiver_config.decoders(i).has_name());
176 ASSERT_TRUE(receiver_config.decoders(i).has_payload_type());
177 const std::string& decoder_name = receiver_config.decoders(i).name();
178 int decoder_type = receiver_config.decoders(i).payload_type();
179 EXPECT_EQ(config.decoders[i].payload_name, decoder_name);
180 EXPECT_EQ(config.decoders[i].payload_type, decoder_type);
181 }
182 }
183
184 void VerifySendStreamConfig(const rtclog::Event& event,
185 const VideoSendStream::Config& config) {
186 ASSERT_TRUE(IsValidBasicEvent(event));
187 ASSERT_EQ(rtclog::Event::VIDEO_SENDER_CONFIG_EVENT, event.type());
188 const rtclog::VideoSendConfig& sender_config = event.video_sender_config();
189 // Check SSRCs.
190 ASSERT_EQ(static_cast<int>(config.rtp.ssrcs.size()),
191 sender_config.ssrcs_size());
192 for (int i = 0; i < sender_config.ssrcs_size(); i++) {
193 EXPECT_EQ(config.rtp.ssrcs[i], sender_config.ssrcs(i));
194 }
195 // Check header extensions.
196 ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()),
197 sender_config.header_extensions_size());
198 for (int i = 0; i < sender_config.header_extensions_size(); i++) {
199 ASSERT_TRUE(sender_config.header_extensions(i).has_name());
200 ASSERT_TRUE(sender_config.header_extensions(i).has_id());
201 const std::string& name = sender_config.header_extensions(i).name();
202 int id = sender_config.header_extensions(i).id();
203 EXPECT_EQ(config.rtp.extensions[i].id, id);
204 EXPECT_EQ(config.rtp.extensions[i].name, name);
205 }
206 // Check RTX settings.
207 ASSERT_EQ(static_cast<int>(config.rtp.rtx.ssrcs.size()),
208 sender_config.rtx_ssrcs_size());
209 for (int i = 0; i < sender_config.rtx_ssrcs_size(); i++) {
210 EXPECT_EQ(config.rtp.rtx.ssrcs[i], sender_config.rtx_ssrcs(i));
211 }
212 if (sender_config.rtx_ssrcs_size() > 0) {
213 ASSERT_TRUE(sender_config.has_rtx_payload_type());
214 EXPECT_EQ(config.rtp.rtx.payload_type, sender_config.rtx_payload_type());
215 }
216 // Check encoder.
217 ASSERT_TRUE(sender_config.has_encoder());
218 ASSERT_TRUE(sender_config.encoder().has_name());
219 ASSERT_TRUE(sender_config.encoder().has_payload_type());
220 EXPECT_EQ(config.encoder_settings.payload_name,
221 sender_config.encoder().name());
222 EXPECT_EQ(config.encoder_settings.payload_type,
223 sender_config.encoder().payload_type());
224 }
225
226 void VerifyRtpEvent(const rtclog::Event& event,
227 bool incoming,
228 MediaType media_type,
229 const uint8_t* header,
230 size_t header_size,
231 size_t total_size) {
232 ASSERT_TRUE(IsValidBasicEvent(event));
233 ASSERT_EQ(rtclog::Event::RTP_EVENT, event.type());
234 const rtclog::RtpPacket& rtp_packet = event.rtp_packet();
235 ASSERT_TRUE(rtp_packet.has_incoming());
236 EXPECT_EQ(incoming, rtp_packet.incoming());
237 ASSERT_TRUE(rtp_packet.has_type());
238 EXPECT_EQ(media_type, GetRuntimeMediaType(rtp_packet.type()));
239 ASSERT_TRUE(rtp_packet.has_packet_length());
240 EXPECT_EQ(total_size, rtp_packet.packet_length());
241 ASSERT_TRUE(rtp_packet.has_header());
242 ASSERT_EQ(header_size, rtp_packet.header().size());
243 for (size_t i = 0; i < header_size; i++) {
244 EXPECT_EQ(header[i], static_cast<uint8_t>(rtp_packet.header()[i]));
245 }
246 }
247
248 void VerifyRtcpEvent(const rtclog::Event& event,
249 bool incoming,
250 MediaType media_type,
251 const uint8_t* packet,
252 size_t total_size) {
253 ASSERT_TRUE(IsValidBasicEvent(event));
254 ASSERT_EQ(rtclog::Event::RTCP_EVENT, event.type());
255 const rtclog::RtcpPacket& rtcp_packet = event.rtcp_packet();
256 ASSERT_TRUE(rtcp_packet.has_incoming());
257 EXPECT_EQ(incoming, rtcp_packet.incoming());
258 ASSERT_TRUE(rtcp_packet.has_type());
259 EXPECT_EQ(media_type, GetRuntimeMediaType(rtcp_packet.type()));
260 ASSERT_TRUE(rtcp_packet.has_packet_data());
261 ASSERT_EQ(total_size, rtcp_packet.packet_data().size());
262 for (size_t i = 0; i < total_size; i++) {
263 EXPECT_EQ(packet[i], static_cast<uint8_t>(rtcp_packet.packet_data()[i]));
264 }
265 }
266
267 void VerifyPlayoutEvent(const rtclog::Event& event, uint32_t ssrc) {
268 ASSERT_TRUE(IsValidBasicEvent(event));
269 ASSERT_EQ(rtclog::Event::AUDIO_PLAYOUT_EVENT, event.type());
270 const rtclog::AudioPlayoutEvent& playout_event = event.audio_playout_event();
271 ASSERT_TRUE(playout_event.has_local_ssrc());
272 EXPECT_EQ(ssrc, playout_event.local_ssrc());
273 }
274
275 void VerifyBweLossEvent(const rtclog::Event& event,
276 int32_t bitrate,
277 uint8_t fraction_loss,
278 int32_t total_packets) {
279 ASSERT_TRUE(IsValidBasicEvent(event));
280 ASSERT_EQ(rtclog::Event::BWE_PACKET_LOSS_EVENT, event.type());
281 const rtclog::BwePacketLossEvent& bwe_event = event.bwe_packet_loss_event();
282 ASSERT_TRUE(bwe_event.has_bitrate());
283 EXPECT_EQ(bitrate, bwe_event.bitrate());
284 ASSERT_TRUE(bwe_event.has_fraction_loss());
285 EXPECT_EQ(fraction_loss, bwe_event.fraction_loss());
286 ASSERT_TRUE(bwe_event.has_total_packets());
287 EXPECT_EQ(total_packets, bwe_event.total_packets());
288 }
289
290 void VerifyLogStartEvent(const rtclog::Event& event) {
291 ASSERT_TRUE(IsValidBasicEvent(event));
292 EXPECT_EQ(rtclog::Event::LOG_START, event.type());
293 }
294 60
295 /* 61 /*
296 * Bit number i of extension_bitvector is set to indicate the 62 * Bit number i of extension_bitvector is set to indicate the
297 * presence of extension number i from kExtensionTypes / kExtensionNames. 63 * presence of extension number i from kExtensionTypes / kExtensionNames.
298 * The least significant bit extension_bitvector has number 0. 64 * The least significant bit extension_bitvector has number 0.
299 */ 65 */
300 size_t GenerateRtpPacket(uint32_t extensions_bitvector, 66 size_t GenerateRtpPacket(uint32_t extensions_bitvector,
301 uint32_t csrcs_count, 67 uint32_t csrcs_count,
302 uint8_t* packet, 68 uint8_t* packet,
303 size_t packet_size, 69 size_t packet_size,
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 bwe_loss_updates[bwe_loss_index - 1].second, i); 267 bwe_loss_updates[bwe_loss_index - 1].second, i);
502 bwe_loss_index++; 268 bwe_loss_index++;
503 } 269 }
504 if (i == rtp_count / 2) { 270 if (i == rtp_count / 2) {
505 log_dumper->StartLogging(temp_filename, 10000000); 271 log_dumper->StartLogging(temp_filename, 10000000);
506 } 272 }
507 } 273 }
508 } 274 }
509 275
510 // Read the generated file from disk. 276 // Read the generated file from disk.
511 rtclog::EventStream parsed_stream; 277 ParsedRtcEventLog parsed_log;
512 278
513 ASSERT_TRUE(RtcEventLog::ParseRtcEventLog(temp_filename, &parsed_stream)); 279 ASSERT_TRUE(parsed_log.ParseFile(temp_filename));
514 280
515 // Verify that what we read back from the event log is the same as 281 // Verify that what we read back from the event log is the same as
516 // what we wrote down. For RTCP we log the full packets, but for 282 // what we wrote down. For RTCP we log the full packets, but for
517 // RTP we should only log the header. 283 // RTP we should only log the header.
518 const int event_count = config_count + playout_count + bwe_loss_count + 284 const size_t event_count = config_count + playout_count + bwe_loss_count +
519 rtcp_count + rtp_count + 1; 285 rtcp_count + rtp_count + 1;
520 EXPECT_EQ(event_count, parsed_stream.stream_size()); 286 EXPECT_EQ(event_count, parsed_log.GetNumberOfEvents());
521 VerifyReceiveStreamConfig(parsed_stream.stream(0), receiver_config); 287 RtcEventLogTestHelper::VerifyReceiveStreamConfig(parsed_log, 0,
522 VerifySendStreamConfig(parsed_stream.stream(1), sender_config); 288 receiver_config);
289 RtcEventLogTestHelper::VerifySendStreamConfig(parsed_log, 1, sender_config);
523 size_t event_index = config_count; 290 size_t event_index = config_count;
524 size_t rtcp_index = 1; 291 size_t rtcp_index = 1;
525 size_t playout_index = 1; 292 size_t playout_index = 1;
526 size_t bwe_loss_index = 1; 293 size_t bwe_loss_index = 1;
527 for (size_t i = 1; i <= rtp_count; i++) { 294 for (size_t i = 1; i <= rtp_count; i++) {
528 VerifyRtpEvent(parsed_stream.stream(event_index), 295 RtcEventLogTestHelper::VerifyRtpEvent(
529 (i % 2 == 0), // Every second packet is incoming. 296 parsed_log, event_index,
530 (i % 3 == 0) ? MediaType::AUDIO : MediaType::VIDEO, 297 (i % 2 == 0) ? kIncomingPacket : kOutgoingPacket,
531 rtp_packets[i - 1].data(), rtp_header_sizes[i - 1], 298 (i % 3 == 0) ? MediaType::AUDIO : MediaType::VIDEO,
532 rtp_packets[i - 1].size()); 299 rtp_packets[i - 1].data(), rtp_header_sizes[i - 1],
300 rtp_packets[i - 1].size());
533 event_index++; 301 event_index++;
534 if (i * rtcp_count >= rtcp_index * rtp_count) { 302 if (i * rtcp_count >= rtcp_index * rtp_count) {
535 VerifyRtcpEvent(parsed_stream.stream(event_index), 303 RtcEventLogTestHelper::VerifyRtcpEvent(
536 rtcp_index % 2 == 0, // Every second packet is incoming. 304 parsed_log, event_index,
537 rtcp_index % 3 == 0 ? MediaType::AUDIO : MediaType::VIDEO, 305 rtcp_index % 2 == 0 ? kIncomingPacket : kOutgoingPacket,
538 rtcp_packets[rtcp_index - 1].data(), 306 rtcp_index % 3 == 0 ? MediaType::AUDIO : MediaType::VIDEO,
539 rtcp_packets[rtcp_index - 1].size()); 307 rtcp_packets[rtcp_index - 1].data(),
308 rtcp_packets[rtcp_index - 1].size());
540 event_index++; 309 event_index++;
541 rtcp_index++; 310 rtcp_index++;
542 } 311 }
543 if (i * playout_count >= playout_index * rtp_count) { 312 if (i * playout_count >= playout_index * rtp_count) {
544 VerifyPlayoutEvent(parsed_stream.stream(event_index), 313 RtcEventLogTestHelper::VerifyPlayoutEvent(
545 playout_ssrcs[playout_index - 1]); 314 parsed_log, event_index, playout_ssrcs[playout_index - 1]);
546 event_index++; 315 event_index++;
547 playout_index++; 316 playout_index++;
548 } 317 }
549 if (i * bwe_loss_count >= bwe_loss_index * rtp_count) { 318 if (i * bwe_loss_count >= bwe_loss_index * rtp_count) {
550 VerifyBweLossEvent(parsed_stream.stream(event_index), 319 RtcEventLogTestHelper::VerifyBweLossEvent(
551 bwe_loss_updates[bwe_loss_index - 1].first, 320 parsed_log, event_index, bwe_loss_updates[bwe_loss_index - 1].first,
552 bwe_loss_updates[bwe_loss_index - 1].second, i); 321 bwe_loss_updates[bwe_loss_index - 1].second, i);
553 event_index++; 322 event_index++;
554 bwe_loss_index++; 323 bwe_loss_index++;
555 } 324 }
556 if (i == rtp_count / 2) { 325 if (i == rtp_count / 2) {
557 VerifyLogStartEvent(parsed_stream.stream(event_index)); 326 RtcEventLogTestHelper::VerifyLogStartEvent(parsed_log, event_index);
558 event_index++; 327 event_index++;
559 } 328 }
560 } 329 }
561 330
562 // Clean up temporary file - can be pretty slow. 331 // Clean up temporary file - can be pretty slow.
563 remove(temp_filename.c_str()); 332 remove(temp_filename.c_str());
564 } 333 }
565 334
566 TEST(RtcEventLogTest, LogSessionAndReadBack) { 335 TEST(RtcEventLogTest, LogSessionAndReadBack) {
567 // Log 5 RTP, 2 RTCP, 0 playout events and 0 BWE events 336 // Log 5 RTP, 2 RTCP, 0 playout events and 0 BWE events
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 log_dumper->StartLogging(temp_filename, 10000000); 422 log_dumper->StartLogging(temp_filename, 10000000);
654 log_dumper->LogRtpHeader(kIncomingPacket, MediaType::VIDEO, 423 log_dumper->LogRtpHeader(kIncomingPacket, MediaType::VIDEO,
655 recent_rtp_packet.data(), 424 recent_rtp_packet.data(),
656 recent_rtp_packet.size()); 425 recent_rtp_packet.size());
657 log_dumper->LogRtcpPacket(kOutgoingPacket, MediaType::VIDEO, 426 log_dumper->LogRtcpPacket(kOutgoingPacket, MediaType::VIDEO,
658 recent_rtcp_packet.data(), 427 recent_rtcp_packet.data(),
659 recent_rtcp_packet.size()); 428 recent_rtcp_packet.size());
660 } 429 }
661 430
662 // Read the generated file from disk. 431 // Read the generated file from disk.
663 rtclog::EventStream parsed_stream; 432 ParsedRtcEventLog parsed_log;
664 ASSERT_TRUE(RtcEventLog::ParseRtcEventLog(temp_filename, &parsed_stream)); 433 ASSERT_TRUE(parsed_log.ParseFile(temp_filename));
665 434
666 // Verify that what we read back from the event log is the same as 435 // Verify that what we read back from the event log is the same as
667 // what we wrote. Old RTP and RTCP events should have been discarded, 436 // what we wrote. Old RTP and RTCP events should have been discarded,
668 // but old configuration events should still be available. 437 // but old configuration events should still be available.
669 EXPECT_EQ(5, parsed_stream.stream_size()); 438 EXPECT_EQ(5u, parsed_log.GetNumberOfEvents());
670 VerifyReceiveStreamConfig(parsed_stream.stream(0), receiver_config); 439 RtcEventLogTestHelper::VerifyReceiveStreamConfig(parsed_log, 0,
671 VerifySendStreamConfig(parsed_stream.stream(1), sender_config); 440 receiver_config);
672 VerifyLogStartEvent(parsed_stream.stream(2)); 441 RtcEventLogTestHelper::VerifySendStreamConfig(parsed_log, 1, sender_config);
673 VerifyRtpEvent(parsed_stream.stream(3), true, MediaType::VIDEO, 442 RtcEventLogTestHelper::VerifyLogStartEvent(parsed_log, 2);
674 recent_rtp_packet.data(), recent_header_size, 443 RtcEventLogTestHelper::VerifyRtpEvent(
675 recent_rtp_packet.size()); 444 parsed_log, 3, kIncomingPacket, MediaType::VIDEO,
676 VerifyRtcpEvent(parsed_stream.stream(4), false, MediaType::VIDEO, 445 recent_rtp_packet.data(), recent_header_size, recent_rtp_packet.size());
677 recent_rtcp_packet.data(), recent_rtcp_packet.size()); 446 RtcEventLogTestHelper::VerifyRtcpEvent(
447 parsed_log, 4, kOutgoingPacket, MediaType::VIDEO,
448 recent_rtcp_packet.data(), recent_rtcp_packet.size());
678 449
679 // Clean up temporary file - can be pretty slow. 450 // Clean up temporary file - can be pretty slow.
680 remove(temp_filename.c_str()); 451 remove(temp_filename.c_str());
681 } 452 }
682 453
683 TEST(RtcEventLogTest, DropOldEvents) { 454 TEST(RtcEventLogTest, DropOldEvents) {
684 // Enable all header extensions 455 // Enable all header extensions
685 uint32_t extensions = (1u << kNumExtensions) - 1; 456 uint32_t extensions = (1u << kNumExtensions) - 1;
686 uint32_t csrcs_count = 2; 457 uint32_t csrcs_count = 2;
687 DropOldEvents(extensions, csrcs_count, 141421356); 458 DropOldEvents(extensions, csrcs_count, 141421356);
688 DropOldEvents(extensions, csrcs_count, 173205080); 459 DropOldEvents(extensions, csrcs_count, 173205080);
689 } 460 }
690 461
691 } // namespace webrtc 462 } // namespace webrtc
692 463
693 #endif // ENABLE_RTC_EVENT_LOG 464 #endif // ENABLE_RTC_EVENT_LOG
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698