From 6fed92485776ca6fa88f51c0f6223206d4e45275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 9 Mar 2018 15:31:17 +0100 Subject: [PATCH] Delete RTPPayloadRegistry::SetIncomingPayloadType. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It only affects the write-only member |incoming_payload_type_|. Bug: webrtc:8995 Change-Id: I0cf86a6d0603c809367105cee31eb1b8b2802d32 Reviewed-on: https://webrtc-review.googlesource.com/61040 Reviewed-by: Fredrik Solenberg Reviewed-by: Erik Språng Reviewed-by: Danil Chapovalov Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#22382} --- audio/channel.cc | 1 - modules/rtp_rtcp/include/rtp_payload_registry.h | 6 ------ modules/rtp_rtcp/source/rtp_payload_registry.cc | 13 +------------ video/rtp_video_stream_receiver.cc | 5 +---- 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/audio/channel.cc b/audio/channel.cc index 98030c0672..d50c161cf1 100644 --- a/audio/channel.cc +++ b/audio/channel.cc @@ -922,7 +922,6 @@ void Channel::OnRtpPacket(const RtpPacketReceived& packet) { bool in_order = IsPacketInOrder(header); rtp_receive_statistics_->IncomingPacket( header, packet.size(), IsPacketRetransmitted(header, in_order)); - rtp_payload_registry_->SetIncomingPayloadType(header); ReceivePacket(packet.data(), packet.size(), header); } diff --git a/modules/rtp_rtcp/include/rtp_payload_registry.h b/modules/rtp_rtcp/include/rtp_payload_registry.h index 3393eb8dd4..1f8a0a4213 100644 --- a/modules/rtp_rtcp/include/rtp_payload_registry.h +++ b/modules/rtp_rtcp/include/rtp_payload_registry.h @@ -65,11 +65,6 @@ class RTPPayloadRegistry { last_received_media_payload_type_ = -1; } - // This sets the payload type of the packets being received from the network - // on the media SSRC. For instance if packets are encapsulated with RED, this - // payload type will be the RED payload type. - void SetIncomingPayloadType(const RTPHeader& header); - // Returns true if the new media payload type has not changed. bool ReportMediaPayloadType(uint8_t media_payload_type); @@ -103,7 +98,6 @@ class RTPPayloadRegistry { rtc::CriticalSection crit_sect_; std::map payload_type_map_; - int8_t incoming_payload_type_; int8_t last_received_payload_type_; int8_t last_received_media_payload_type_; bool rtx_; diff --git a/modules/rtp_rtcp/source/rtp_payload_registry.cc b/modules/rtp_rtcp/source/rtp_payload_registry.cc index 25ecb2d424..4e1ef200b4 100644 --- a/modules/rtp_rtcp/source/rtp_payload_registry.cc +++ b/modules/rtp_rtcp/source/rtp_payload_registry.cc @@ -103,8 +103,7 @@ bool IsPayloadTypeValid(int8_t payload_type) { } // namespace RTPPayloadRegistry::RTPPayloadRegistry() - : incoming_payload_type_(-1), - last_received_payload_type_(-1), + : last_received_payload_type_(-1), last_received_media_payload_type_(-1), rtx_(false), ssrc_rtx_(0) {} @@ -267,10 +266,6 @@ bool RTPPayloadRegistry::RtxEnabled() const { return rtx_; } -bool RTPPayloadRegistry::IsRtxInternal(const RTPHeader& header) const { - return rtx_ && ssrc_rtx_ == header.ssrc; -} - void RTPPayloadRegistry::SetRtxSsrc(uint32_t ssrc) { rtc::CritScope cs(&crit_sect_); ssrc_rtx_ = ssrc; @@ -310,12 +305,6 @@ rtc::Optional RTPPayloadRegistry::PayloadTypeToPayload( : rtc::Optional(it->second); } -void RTPPayloadRegistry::SetIncomingPayloadType(const RTPHeader& header) { - rtc::CritScope cs(&crit_sect_); - if (!IsRtxInternal(header)) - incoming_payload_type_ = header.payloadType; -} - bool RTPPayloadRegistry::ReportMediaPayloadType(uint8_t media_payload_type) { rtc::CritScope cs(&crit_sect_); if (last_received_media_payload_type_ == media_payload_type) { diff --git a/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc index 6d69a6fe09..7379facc86 100644 --- a/video/rtp_video_stream_receiver.cc +++ b/video/rtp_video_stream_receiver.cc @@ -331,10 +331,7 @@ void RtpVideoStreamReceiver::OnRtpPacket(const RtpPacketReceived& packet) { header.payload_type_frequency = kVideoPayloadTypeFrequency; bool in_order = IsPacketInOrder(header); - if (!packet.recovered()) { - // TODO(nisse): Why isn't this done for recovered packets? - rtp_payload_registry_.SetIncomingPayloadType(header); - } + ReceivePacket(packet.data(), packet.size(), header); // Update receive statistics after ReceivePacket. // Receive statistics will be reset if the payload type changes (make sure