From 3eab10d629a5f549ddd62ec3053088205155d5b8 Mon Sep 17 00:00:00 2001 From: noahric Date: Sat, 17 Oct 2015 01:06:42 -0700 Subject: [PATCH] Add back an override of RestoreOriginalPacket. External consumers may have a dependency on the old name, so this will give them the opportunity to switch over. BUG= Review URL: https://codereview.webrtc.org/1414543002 Cr-Commit-Position: refs/heads/master@{#10310} --- webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h | 9 +++++++++ webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h b/webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h index a60a6c5e73..313bef1112 100644 --- a/webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h +++ b/webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h @@ -83,6 +83,15 @@ 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, diff --git a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc index 5958fea230..f9a1fdc1a9 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc @@ -232,6 +232,15 @@ 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,