diff --git a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h index 06ef2fc4a1..a24fc34982 100644 --- a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h +++ b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h @@ -87,15 +87,6 @@ class RTPPayloadRegistry { bool IsRtx(const RTPHeader& header) const; - // DEPRECATED. Use RestoreOriginalPacket below that takes a uint8_t* - // restored_packet, instead of a uint8_t**. - // TODO(noahric): Remove this when all callers have been updated. - bool RestoreOriginalPacket(uint8_t** restored_packet, - const uint8_t* packet, - size_t* packet_length, - uint32_t original_ssrc, - const RTPHeader& header) const; - bool RestoreOriginalPacket(uint8_t* restored_packet, const uint8_t* packet, size_t* packet_length, @@ -112,15 +103,6 @@ class RTPPayloadRegistry { int GetPayloadTypeFrequency(uint8_t payload_type) const; - // DEPRECATED. Use PayloadTypeToPayload below that returns const Payload* - // instead of taking output parameter. - // TODO(danilchap): Remove this when all callers have been updated. - bool PayloadTypeToPayload(const uint8_t payload_type, - RtpUtility::Payload*& payload) const { // NOLINT - payload = - const_cast(PayloadTypeToPayload(payload_type)); - return payload != nullptr; - } const RtpUtility::Payload* PayloadTypeToPayload(uint8_t payload_type) const; void ResetLastReceivedPayloadTypes() { diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h index 50cda8dfba..3f496d4657 100644 --- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h +++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h @@ -595,12 +595,6 @@ class RtpRtcp : public Module { * * return -1 on failure else 0 */ - // DEPRECATED. Use SendREDPayloadType below that takes output parameter - // by pointer instead of by reference. - // TODO(danilchap): Remove this when all callers have been updated. - int32_t SendREDPayloadType(int8_t& payloadType) const { // NOLINT - return SendREDPayloadType(&payloadType); - } virtual int32_t SendREDPayloadType(int8_t* payload_type) const = 0; /* * Store the audio level in dBov for header-extension-for-audio-level- @@ -633,14 +627,6 @@ class RtpRtcp : public Module { /* * Get generic FEC setting */ - // DEPRECATED. Use GenericFECStatus below that takes output parameters - // by pointers instead of by references. - // TODO(danilchap): Remove this when all callers have been updated. - void GenericFECStatus(bool& enable, // NOLINT - uint8_t& payloadTypeRED, // NOLINT - uint8_t& payloadTypeFEC) { // NOLINT - GenericFECStatus(&enable, &payloadTypeRED, &payloadTypeFEC); - } virtual void GenericFECStatus(bool* enable, uint8_t* payload_type_red, uint8_t* payload_type_fec) = 0; diff --git a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc index e379580a04..091d27161f 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc @@ -230,15 +230,6 @@ bool RTPPayloadRegistry::IsRtxInternal(const RTPHeader& header) const { return rtx_ && ssrc_rtx_ == header.ssrc; } -bool RTPPayloadRegistry::RestoreOriginalPacket(uint8_t** restored_packet, - const uint8_t* packet, - size_t* packet_length, - uint32_t original_ssrc, - const RTPHeader& header) const { - return RestoreOriginalPacket(*restored_packet, packet, packet_length, - original_ssrc, header); -} - bool RTPPayloadRegistry::RestoreOriginalPacket(uint8_t* restored_packet, const uint8_t* packet, size_t* packet_length, diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.h b/webrtc/modules/rtp_rtcp/source/rtp_utility.h index 1a24285395..474bc6e04e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_utility.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.h @@ -52,11 +52,6 @@ class RtpHeaderParser { bool ParseRtcp(RTPHeader* header) const; bool Parse(RTPHeader* parsedPacket, RtpHeaderExtensionMap* ptrExtensionMap = nullptr) const; - RTC_DEPRECATED bool Parse( - RTPHeader& parsedPacket, // NOLINT(runtime/references) - RtpHeaderExtensionMap* ptrExtensionMap = nullptr) const { - return Parse(&parsedPacket, ptrExtensionMap); - } private: void ParseOneByteExtensionHeader(RTPHeader* parsedPacket,