From 09ae92a38f5c0f0535440087f0c6db9243d1f32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 9 Mar 2018 14:47:22 +0100 Subject: [PATCH] Delete unused method RTPPayloadRegistry::SetRtxPayloadType. And write-only mapping rtx_payload_type_map_. Bug: webrtc:8995 Change-Id: I5193d411587bc4eadb9521250519990781515a76 Reviewed-on: https://webrtc-review.googlesource.com/61041 Reviewed-by: Danil Chapovalov Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#22369} --- modules/rtp_rtcp/include/rtp_payload_registry.h | 4 ---- modules/rtp_rtcp/source/rtp_payload_registry.cc | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/modules/rtp_rtcp/include/rtp_payload_registry.h b/modules/rtp_rtcp/include/rtp_payload_registry.h index 942c4ff1e7..3393eb8dd4 100644 --- a/modules/rtp_rtcp/include/rtp_payload_registry.h +++ b/modules/rtp_rtcp/include/rtp_payload_registry.h @@ -52,8 +52,6 @@ class RTPPayloadRegistry { bool GetRtxSsrc(uint32_t* ssrc) const; - void SetRtxPayloadType(int payload_type, int associated_payload_type); - bool IsRed(const RTPHeader& header) const; int GetPayloadTypeFrequency(uint8_t payload_type) const; @@ -109,8 +107,6 @@ class RTPPayloadRegistry { int8_t last_received_payload_type_; int8_t last_received_media_payload_type_; bool rtx_; - // Mapping rtx_payload_type_map_[rtx] = associated. - std::map rtx_payload_type_map_; uint32_t ssrc_rtx_; // Only warn once per payload type, if an RTX packet is received but // no associated payload type found in |rtx_payload_type_map_|. diff --git a/modules/rtp_rtcp/source/rtp_payload_registry.cc b/modules/rtp_rtcp/source/rtp_payload_registry.cc index 7f7b564fbf..25ecb2d424 100644 --- a/modules/rtp_rtcp/source/rtp_payload_registry.cc +++ b/modules/rtp_rtcp/source/rtp_payload_registry.cc @@ -283,18 +283,6 @@ bool RTPPayloadRegistry::GetRtxSsrc(uint32_t* ssrc) const { return rtx_; } -void RTPPayloadRegistry::SetRtxPayloadType(int payload_type, - int associated_payload_type) { - rtc::CritScope cs(&crit_sect_); - if (payload_type < 0) { - RTC_LOG(LS_ERROR) << "Invalid RTX payload type: " << payload_type; - return; - } - - rtx_payload_type_map_[payload_type] = associated_payload_type; - rtx_ = true; -} - bool RTPPayloadRegistry::IsRed(const RTPHeader& header) const { rtc::CritScope cs(&crit_sect_); auto it = payload_type_map_.find(header.payloadType);