Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / rtp_rtcp / source / rtp_header_parser.cc

diff --git a/src/third_party/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc b/src/third_party/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc
index bb24d4d..3fc2666 100644 (file)
--- a/src/third_party/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc
+++ b/src/third_party/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc
@@ -21,7 +21,8 @@ class RtpHeaderParserImpl : public RtpHeaderParser {
   RtpHeaderParserImpl();
   virtual ~RtpHeaderParserImpl() {}
 
-  virtual bool Parse(const uint8_t* packet, int length,
+  virtual bool Parse(const uint8_t* packet,
+                     size_t length,
                      RTPHeader* header) const OVERRIDE;
 
   virtual bool RegisterRtpHeaderExtension(RTPExtensionType type,
@@ -31,7 +32,7 @@ class RtpHeaderParserImpl : public RtpHeaderParser {
 
  private:
   scoped_ptr<CriticalSectionWrapper> critical_section_;
-  RtpHeaderExtensionMap rtp_header_extension_map_;
+  RtpHeaderExtensionMap rtp_header_extension_map_ GUARDED_BY(critical_section_);
 };
 
 RtpHeaderParser* RtpHeaderParser::Create() {
@@ -41,14 +42,15 @@ RtpHeaderParser* RtpHeaderParser::Create() {
 RtpHeaderParserImpl::RtpHeaderParserImpl()
     : critical_section_(CriticalSectionWrapper::CreateCriticalSection()) {}
 
-bool RtpHeaderParser::IsRtcp(const uint8_t* packet, int length) {
-  ModuleRTPUtility::RTPHeaderParser rtp_parser(packet, length);
+bool RtpHeaderParser::IsRtcp(const uint8_t* packet, size_t length) {
+  RtpUtility::RtpHeaderParser rtp_parser(packet, length);
   return rtp_parser.RTCP();
 }
 
-bool RtpHeaderParserImpl::Parse(const uint8_t* packet, int length,
-                            RTPHeader* header) const {
-  ModuleRTPUtility::RTPHeaderParser rtp_parser(packet, length);
+bool RtpHeaderParserImpl::Parse(const uint8_t* packet,
+                                size_t length,
+                                RTPHeader* header) const {
+  RtpUtility::RtpHeaderParser rtp_parser(packet, length);
   memset(header, 0, sizeof(*header));
 
   RtpHeaderExtensionMap map;