From 6cbb468b6d53e373909ffe5ea69e65b2c6da0c79 Mon Sep 17 00:00:00 2001 From: philipel Date: Fri, 30 Sep 2022 17:23:04 +0200 Subject: [PATCH] In VideoReplayer, use MediaType::ANY when calling DeliverPacket with RTCP packet. Bug: webrtc:14508 Change-Id: I402b35eb89d6e70122f9ff5bd51db0462c456f5d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/277621 Commit-Queue: Philip Eliasson Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#38269} --- rtc_tools/video_replay.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rtc_tools/video_replay.cc b/rtc_tools/video_replay.cc index 6eb793d7f5..1b3e6013bc 100644 --- a/rtc_tools/video_replay.cc +++ b/rtc_tools/video_replay.cc @@ -26,6 +26,7 @@ #include "common_video/libyuv/include/webrtc_libyuv.h" #include "media/engine/internal_decoder_factory.h" #include "modules/rtp_rtcp/source/rtp_packet.h" +#include "modules/rtp_rtcp/source/rtp_util.h" #include "modules/video_coding/utility/ivf_file_writer.h" #include "rtc_base/checks.h" #include "rtc_base/string_to_number.h" @@ -606,7 +607,9 @@ class RtpReplayer final { ++num_packets; PacketReceiver::DeliveryStatus result = PacketReceiver::DELIVERY_OK; worker_thread->PostTask([&]() { - result = call->Receiver()->DeliverPacket(webrtc::MediaType::VIDEO, + MediaType media_type = + IsRtcpPacket(packet_buffer) ? MediaType::ANY : MediaType::VIDEO; + result = call->Receiver()->DeliverPacket(media_type, std::move(packet_buffer), /* packet_time_us */ -1); event.Set();