Index: webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc |
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc b/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc |
index e655b4b51329e935eb3a4c83933c9118015b77c8..b5c91faf9ff9ae4e875dcbf7948453f24fdbd678 100644 |
--- a/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc |
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc |
@@ -306,13 +306,11 @@ void LogSessionAndReadBack(size_t rtp_count, |
for (size_t i = 1; i <= rtp_count; i++) { |
log_dumper->LogRtpHeader( |
(i % 2 == 0) ? kIncomingPacket : kOutgoingPacket, |
- (i % 3 == 0) ? MediaType::AUDIO : MediaType::VIDEO, |
rtp_packets[i - 1].data(), rtp_packets[i - 1].size()); |
fake_clock.AdvanceTimeMicros(prng.Rand(1, 1000)); |
if (i * rtcp_count >= rtcp_index * rtp_count) { |
log_dumper->LogRtcpPacket( |
(rtcp_index % 2 == 0) ? kIncomingPacket : kOutgoingPacket, |
- rtcp_index % 3 == 0 ? MediaType::AUDIO : MediaType::VIDEO, |
rtcp_packets[rtcp_index - 1].data(), |
rtcp_packets[rtcp_index - 1].size()); |
rtcp_index++; |
@@ -368,7 +366,6 @@ void LogSessionAndReadBack(size_t rtp_count, |
RtcEventLogTestHelper::VerifyRtpEvent( |
parsed_log, event_index, |
(i % 2 == 0) ? kIncomingPacket : kOutgoingPacket, |
- (i % 3 == 0) ? MediaType::AUDIO : MediaType::VIDEO, |
rtp_packets[i - 1].data(), rtp_packets[i - 1].headers_size(), |
rtp_packets[i - 1].size()); |
event_index++; |
@@ -376,7 +373,6 @@ void LogSessionAndReadBack(size_t rtp_count, |
RtcEventLogTestHelper::VerifyRtcpEvent( |
parsed_log, event_index, |
rtcp_index % 2 == 0 ? kIncomingPacket : kOutgoingPacket, |
- rtcp_index % 3 == 0 ? MediaType::AUDIO : MediaType::VIDEO, |
rtcp_packets[rtcp_index - 1].data(), |
rtcp_packets[rtcp_index - 1].size()); |
event_index++; |
@@ -454,15 +450,15 @@ TEST(RtcEventLogTest, LogEventAndReadBack) { |
fake_clock.SetTimeMicros(prng.Rand<uint32_t>()); |
std::unique_ptr<RtcEventLog> log_dumper(RtcEventLog::Create()); |
- log_dumper->LogRtpHeader(kIncomingPacket, MediaType::VIDEO, rtp_packet.data(), |
+ log_dumper->LogRtpHeader(kIncomingPacket, rtp_packet.data(), |
rtp_packet.size()); |
fake_clock.AdvanceTimeMicros(prng.Rand(1, 1000)); |
log_dumper->StartLogging(temp_filename, 10000000); |
fake_clock.AdvanceTimeMicros(prng.Rand(1, 1000)); |
- log_dumper->LogRtcpPacket(kOutgoingPacket, MediaType::VIDEO, |
- rtcp_packet.data(), rtcp_packet.size()); |
+ log_dumper->LogRtcpPacket(kOutgoingPacket, rtcp_packet.data(), |
+ rtcp_packet.size()); |
fake_clock.AdvanceTimeMicros(prng.Rand(1, 1000)); |
log_dumper->StopLogging(); |
@@ -478,12 +474,11 @@ TEST(RtcEventLogTest, LogEventAndReadBack) { |
RtcEventLogTestHelper::VerifyLogStartEvent(parsed_log, 0); |
RtcEventLogTestHelper::VerifyRtpEvent( |
- parsed_log, 1, kIncomingPacket, MediaType::VIDEO, rtp_packet.data(), |
+ parsed_log, 1, kIncomingPacket, rtp_packet.data(), |
rtp_packet.headers_size(), rtp_packet.size()); |
- RtcEventLogTestHelper::VerifyRtcpEvent(parsed_log, 2, kOutgoingPacket, |
- MediaType::VIDEO, rtcp_packet.data(), |
- rtcp_packet.size()); |
+ RtcEventLogTestHelper::VerifyRtcpEvent( |
+ parsed_log, 2, kOutgoingPacket, rtcp_packet.data(), rtcp_packet.size()); |
RtcEventLogTestHelper::VerifyLogEndEvent(parsed_log, 3); |