From e10675a66657580a68ad2b2b3604b740e8a8d81b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 14 Mar 2018 10:13:43 +0100 Subject: [PATCH] Delete RTPPayloadRegistry::IsRed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8995 Change-Id: I92429fac4cec7e4b4fa22f01d09e680b61db1505 Reviewed-on: https://webrtc-review.googlesource.com/61301 Commit-Queue: Niels Moller Reviewed-by: Erik Språng Reviewed-by: Danil Chapovalov Reviewed-by: Rasmus Brandt Cr-Commit-Position: refs/heads/master@{#22417} --- modules/rtp_rtcp/include/rtp_payload_registry.h | 2 -- modules/rtp_rtcp/source/rtp_payload_registry.cc | 6 ------ video/rtp_video_stream_receiver.cc | 15 ++------------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/modules/rtp_rtcp/include/rtp_payload_registry.h b/modules/rtp_rtcp/include/rtp_payload_registry.h index 60d879752b..2c907c217c 100644 --- a/modules/rtp_rtcp/include/rtp_payload_registry.h +++ b/modules/rtp_rtcp/include/rtp_payload_registry.h @@ -46,8 +46,6 @@ class RTPPayloadRegistry { int32_t ReceivePayloadType(const VideoCodec& video_codec, int8_t* payload_type) const; - bool IsRed(const RTPHeader& header) const; - int GetPayloadTypeFrequency(uint8_t payload_type) const; rtc::Optional PayloadTypeToPayload( diff --git a/modules/rtp_rtcp/source/rtp_payload_registry.cc b/modules/rtp_rtcp/source/rtp_payload_registry.cc index 7a6887fa33..8061628d27 100644 --- a/modules/rtp_rtcp/source/rtp_payload_registry.cc +++ b/modules/rtp_rtcp/source/rtp_payload_registry.cc @@ -259,12 +259,6 @@ int32_t RTPPayloadRegistry::ReceivePayloadType(const VideoCodec& video_codec, return -1; } -bool RTPPayloadRegistry::IsRed(const RTPHeader& header) const { - rtc::CritScope cs(&crit_sect_); - auto it = payload_type_map_.find(header.payloadType); - return it != payload_type_map_.end() && _stricmp(it->second.name, "red") == 0; -} - int RTPPayloadRegistry::GetPayloadTypeFrequency( uint8_t payload_type) const { const auto payload = PayloadTypeToPayload(payload_type); diff --git a/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc index 61fd130d1c..79373fd270 100644 --- a/video/rtp_video_stream_receiver.cc +++ b/video/rtp_video_stream_receiver.cc @@ -138,13 +138,6 @@ RtpVideoStreamReceiver::RtpVideoStreamReceiver( : kDefaultMaxReorderingThreshold; rtp_receive_statistics_->SetMaxReorderingThreshold(max_reordering_threshold); - if (IsRedEnabled()) { - VideoCodec red_codec = {}; - red_codec.codecType = kVideoCodecRED; - red_codec.plType = config_.rtp.red_payload_type; - RTC_CHECK(AddReceiveCodec(red_codec)); - } - if (config_.rtp.rtcp_xr.receiver_reference_time_report) rtp_rtcp_->SetRtcpXrRrtrStatus(true); @@ -344,10 +337,6 @@ bool RtpVideoStreamReceiver::IsUlpfecEnabled() const { return config_.rtp.ulpfec_payload_type != -1; } -bool RtpVideoStreamReceiver::IsRedEnabled() const { - return config_.rtp.red_payload_type != -1; -} - bool RtpVideoStreamReceiver::IsRetransmissionsEnabled() const { return config_.rtp.nack.rtp_history_ms > 0; } @@ -423,7 +412,7 @@ void RtpVideoStreamReceiver::RemoveSecondarySink( void RtpVideoStreamReceiver::ReceivePacket(const uint8_t* packet, size_t packet_length, const RTPHeader& header) { - if (rtp_payload_registry_.IsRed(header)) { + if (header.payloadType == config_.rtp.red_payload_type) { ParseAndHandleEncapsulatingHeader(packet, packet_length, header); return; } @@ -441,7 +430,7 @@ void RtpVideoStreamReceiver::ReceivePacket(const uint8_t* packet, void RtpVideoStreamReceiver::ParseAndHandleEncapsulatingHeader( const uint8_t* packet, size_t packet_length, const RTPHeader& header) { RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_task_checker_); - if (rtp_payload_registry_.IsRed(header)) { + if (header.payloadType == config_.rtp.red_payload_type) { if (packet[header.headerLength] == config_.rtp.ulpfec_payload_type) { rtp_receive_statistics_->FecPacketReceived(header, packet_length); // Notify video_receiver about received FEC packets to avoid NACKing these