OLD | NEW |
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 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" | 10 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 | 46 |
47 bool RtpHeaderParserImpl::Parse(const uint8_t* packet, | 47 bool RtpHeaderParserImpl::Parse(const uint8_t* packet, |
48 size_t length, | 48 size_t length, |
49 RTPHeader* header) const { | 49 RTPHeader* header) const { |
50 RtpUtility::RtpHeaderParser rtp_parser(packet, length); | 50 RtpUtility::RtpHeaderParser rtp_parser(packet, length); |
51 memset(header, 0, sizeof(*header)); | 51 memset(header, 0, sizeof(*header)); |
52 | 52 |
53 RtpHeaderExtensionMap map; | 53 RtpHeaderExtensionMap map; |
54 { | 54 { |
55 rtc::CritScope cs(&critical_section_); | 55 rtc::CritScope cs(&critical_section_); |
56 rtp_header_extension_map_.GetCopy(&map); | 56 map = rtp_header_extension_map_; |
57 } | 57 } |
58 | 58 |
59 const bool valid_rtpheader = rtp_parser.Parse(header, &map); | 59 const bool valid_rtpheader = rtp_parser.Parse(header, &map); |
60 if (!valid_rtpheader) { | 60 if (!valid_rtpheader) { |
61 return false; | 61 return false; |
62 } | 62 } |
63 return true; | 63 return true; |
64 } | 64 } |
65 | 65 |
66 bool RtpHeaderParserImpl::RegisterRtpHeaderExtension(RTPExtensionType type, | 66 bool RtpHeaderParserImpl::RegisterRtpHeaderExtension(RTPExtensionType type, |
67 uint8_t id) { | 67 uint8_t id) { |
68 rtc::CritScope cs(&critical_section_); | 68 rtc::CritScope cs(&critical_section_); |
69 return rtp_header_extension_map_.Register(type, id) == 0; | 69 return rtp_header_extension_map_.RegisterByType(id, type); |
70 } | 70 } |
71 | 71 |
72 bool RtpHeaderParserImpl::DeregisterRtpHeaderExtension(RTPExtensionType type) { | 72 bool RtpHeaderParserImpl::DeregisterRtpHeaderExtension(RTPExtensionType type) { |
73 rtc::CritScope cs(&critical_section_); | 73 rtc::CritScope cs(&critical_section_); |
74 return rtp_header_extension_map_.Deregister(type) == 0; | 74 return rtp_header_extension_map_.Deregister(type) == 0; |
75 } | 75 } |
76 } // namespace webrtc | 76 } // namespace webrtc |
OLD | NEW |