zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated functions in rtp_rtcp module

Browse Source 
Review-Url: https://codereview.webrtc.org/1859273003
Cr-Commit-Position: refs/heads/master@{#12560}
This commit is contained in:
danilchap
2016-04-29 03:01:28 -07:00
committed by Commit bot
parent 0565451820
commit 4edf93bcc6
4 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h
View File

@ -87,15 +87,6 @@ class RTPPayloadRegistry {
bool IsRtx(const RTPHeader& header) const; 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, bool RestoreOriginalPacket(uint8_t* restored_packet,
const uint8_t* packet, const uint8_t* packet,
size_t* packet_length, size_t* packet_length,
@ -112,15 +103,6 @@ class RTPPayloadRegistry {
int GetPayloadTypeFrequency(uint8_t payload_type) const; 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<RtpUtility::Payload*>(PayloadTypeToPayload(payload_type));
return payload != nullptr;
}
const RtpUtility::Payload* PayloadTypeToPayload(uint8_t payload_type) const; const RtpUtility::Payload* PayloadTypeToPayload(uint8_t payload_type) const;
void ResetLastReceivedPayloadTypes() { void ResetLastReceivedPayloadTypes() {

14
webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
View File

@ -595,12 +595,6 @@ class RtpRtcp : public Module {
* *
* return -1 on failure else 0 * 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; virtual int32_t SendREDPayloadType(int8_t* payload_type) const = 0;
/* /*
* Store the audio level in dBov for header-extension-for-audio-level- * Store the audio level in dBov for header-extension-for-audio-level-
@ -633,14 +627,6 @@ class RtpRtcp : public Module {
/* /*
* Get generic FEC setting * 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, virtual void GenericFECStatus(bool* enable,
uint8_t* payload_type_red, uint8_t* payload_type_red,
uint8_t* payload_type_fec) = 0; uint8_t* payload_type_fec) = 0;

9
webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc
View File

@ -230,15 +230,6 @@ bool RTPPayloadRegistry::IsRtxInternal(const RTPHeader& header) const {
return rtx_ && ssrc_rtx_ == header.ssrc; 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, bool RTPPayloadRegistry::RestoreOriginalPacket(uint8_t* restored_packet,
const uint8_t* packet, const uint8_t* packet,
size_t* packet_length, size_t* packet_length,

5
webrtc/modules/rtp_rtcp/source/rtp_utility.h
View File

@ -52,11 +52,6 @@ class RtpHeaderParser {
bool ParseRtcp(RTPHeader* header) const; bool ParseRtcp(RTPHeader* header) const;
bool Parse(RTPHeader* parsedPacket, bool Parse(RTPHeader* parsedPacket,
RtpHeaderExtensionMap* ptrExtensionMap = nullptr) const; RtpHeaderExtensionMap* ptrExtensionMap = nullptr) const;
RTC_DEPRECATED bool Parse(
RTPHeader& parsedPacket, // NOLINT(runtime/references)
RtpHeaderExtensionMap* ptrExtensionMap = nullptr) const {
return Parse(&parsedPacket, ptrExtensionMap);
}
private: private:
void ParseOneByteExtensionHeader(RTPHeader* parsedPacket, void ParseOneByteExtensionHeader(RTPHeader* parsedPacket,