OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 |
11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ | 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ |
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ | 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ |
13 | 13 |
14 #include <map> | 14 #include <map> |
15 | 15 |
| 16 #include "webrtc/base/deprecation.h" |
16 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" | 17 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" |
17 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" | 18 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" |
18 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" | 19 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" |
19 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" | 20 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" |
20 #include "webrtc/typedefs.h" | 21 #include "webrtc/typedefs.h" |
21 | 22 |
22 namespace webrtc { | 23 namespace webrtc { |
23 | 24 |
24 const uint8_t kRtpMarkerBitMask = 0x80; | 25 const uint8_t kRtpMarkerBitMask = 0x80; |
25 | 26 |
(...skipping 19 matching lines...) Expand all Loading... |
45 | 46 |
46 class RtpHeaderParser { | 47 class RtpHeaderParser { |
47 public: | 48 public: |
48 RtpHeaderParser(const uint8_t* rtpData, size_t rtpDataLength); | 49 RtpHeaderParser(const uint8_t* rtpData, size_t rtpDataLength); |
49 ~RtpHeaderParser(); | 50 ~RtpHeaderParser(); |
50 | 51 |
51 bool RTCP() const; | 52 bool RTCP() const; |
52 bool ParseRtcp(RTPHeader* header) const; | 53 bool ParseRtcp(RTPHeader* header) const; |
53 bool Parse(RTPHeader* parsedPacket, | 54 bool Parse(RTPHeader* parsedPacket, |
54 RtpHeaderExtensionMap* ptrExtensionMap = nullptr) const; | 55 RtpHeaderExtensionMap* ptrExtensionMap = nullptr) const; |
| 56 RTC_DEPRECATED bool Parse( |
| 57 RTPHeader& parsedPacket, // NOLINT(runtime/references) |
| 58 RtpHeaderExtensionMap* ptrExtensionMap = nullptr) const { |
| 59 return Parse(&parsedPacket, ptrExtensionMap); |
| 60 } |
55 | 61 |
56 private: | 62 private: |
57 void ParseOneByteExtensionHeader(RTPHeader* parsedPacket, | 63 void ParseOneByteExtensionHeader(RTPHeader* parsedPacket, |
58 const RtpHeaderExtensionMap* ptrExtensionMap, | 64 const RtpHeaderExtensionMap* ptrExtensionMap, |
59 const uint8_t* ptrRTPDataExtensionEnd, | 65 const uint8_t* ptrRTPDataExtensionEnd, |
60 const uint8_t* ptr) const; | 66 const uint8_t* ptr) const; |
61 | 67 |
62 uint8_t ParsePaddingBytes(const uint8_t* ptrRTPDataExtensionEnd, | 68 uint8_t ParsePaddingBytes(const uint8_t* ptrRTPDataExtensionEnd, |
63 const uint8_t* ptr) const; | 69 const uint8_t* ptr) const; |
64 | 70 |
65 const uint8_t* const _ptrRTPDataBegin; | 71 const uint8_t* const _ptrRTPDataBegin; |
66 const uint8_t* const _ptrRTPDataEnd; | 72 const uint8_t* const _ptrRTPDataEnd; |
67 }; | 73 }; |
68 } // namespace RtpUtility | 74 } // namespace RtpUtility |
69 } // namespace webrtc | 75 } // namespace webrtc |
70 | 76 |
71 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ | 77 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_ |
OLD | NEW |