From 1bdce799eb4f07e50d6024c45e317fb5160c7971 Mon Sep 17 00:00:00 2001 From: Bjorn Terelius Date: Wed, 9 Jan 2019 21:31:34 +0100 Subject: [PATCH] Parse logs without RTX SSRC even if there is an RTX payload type. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:10187 Change-Id: I8f446ce5a8960fdaa6e3193c6647b8133b63e9a7 Reviewed-on: https://webrtc-review.googlesource.com/c/116741 Reviewed-by: Sebastian Jansson Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/master@{#26197} --- logging/rtc_event_log/rtc_event_log_parser.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index d0f9f2be40..6f9f979ece 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -1468,20 +1468,18 @@ rtclog::StreamConfig ParsedRtcEventLog::GetVideoSendConfig( RTC_CHECK_EQ(event.type(), rtclog::Event::VIDEO_SENDER_CONFIG_EVENT); RTC_CHECK(event.has_video_sender_config()); const rtclog::VideoSendConfig& sender_config = event.video_sender_config(); + + // Get SSRCs. RTC_CHECK_EQ(sender_config.ssrcs_size(), 1) << "VideoSendStreamConfig no longer stores multiple SSRCs. If you are " "analyzing a very old log, try building the parser from the same " "WebRTC version."; - - // Get SSRCs. config.local_ssrc = sender_config.ssrcs(0); - - if (sender_config.has_rtx_payload_type()) { - RTC_CHECK_EQ(sender_config.rtx_ssrcs_size(), 1); + RTC_CHECK_LE(sender_config.rtx_ssrcs_size(), 1); + if (sender_config.rtx_ssrcs_size() == 1) { config.rtx_ssrc = sender_config.rtx_ssrcs(0); - } else { - RTC_CHECK_EQ(sender_config.rtx_ssrcs_size(), 0); } + // Get header extensions. GetHeaderExtensions(&config.rtp_extensions, sender_config.header_extensions());