Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Side by Side Diff: webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h

Issue 1414543002: Add back an override of RestoreOriginalPacket. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add comment about deprecation Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 bool RtxEnabled() const; 76 bool RtxEnabled() const;
77 77
78 void SetRtxSsrc(uint32_t ssrc); 78 void SetRtxSsrc(uint32_t ssrc);
79 79
80 bool GetRtxSsrc(uint32_t* ssrc) const; 80 bool GetRtxSsrc(uint32_t* ssrc) const;
81 81
82 void SetRtxPayloadType(int payload_type, int associated_payload_type); 82 void SetRtxPayloadType(int payload_type, int associated_payload_type);
83 83
84 bool IsRtx(const RTPHeader& header) const; 84 bool IsRtx(const RTPHeader& header) const;
85 85
86 // DEPRECATED. Use RestoreOriginalPacket below that takes a uint8_t*
87 // restored_packet, instead of a uint8_t**.
88 // TODO(noahric): Remove this when all callers have been updated.
89 bool RestoreOriginalPacket(uint8_t** restored_packet,
90 const uint8_t* packet,
91 size_t* packet_length,
92 uint32_t original_ssrc,
93 const RTPHeader& header) const;
94
86 bool RestoreOriginalPacket(uint8_t* restored_packet, 95 bool RestoreOriginalPacket(uint8_t* restored_packet,
87 const uint8_t* packet, 96 const uint8_t* packet,
88 size_t* packet_length, 97 size_t* packet_length,
89 uint32_t original_ssrc, 98 uint32_t original_ssrc,
90 const RTPHeader& header) const; 99 const RTPHeader& header) const;
91 100
92 bool IsRed(const RTPHeader& header) const; 101 bool IsRed(const RTPHeader& header) const;
93 102
94 // Returns true if the media of this RTP packet is encapsulated within an 103 // Returns true if the media of this RTP packet is encapsulated within an
95 // extra header, such as RTX or RED. 104 // extra header, such as RTX or RED.
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 std::map<int, int> rtx_payload_type_map_; 184 std::map<int, int> rtx_payload_type_map_;
176 // When true, use rtx_payload_type_map_ when restoring RTX packets to get the 185 // When true, use rtx_payload_type_map_ when restoring RTX packets to get the
177 // correct payload type. 186 // correct payload type.
178 bool use_rtx_payload_mapping_on_restore_; 187 bool use_rtx_payload_mapping_on_restore_;
179 uint32_t ssrc_rtx_; 188 uint32_t ssrc_rtx_;
180 }; 189 };
181 190
182 } // namespace webrtc 191 } // namespace webrtc
183 192
184 #endif // WEBRTC_MODULES_RTP_RTCP_INTERFACE_RTP_PAYLOAD_REGISTRY_H_ 193 #endif // WEBRTC_MODULES_RTP_RTCP_INTERFACE_RTP_PAYLOAD_REGISTRY_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698