Fixed sending Rtp packets with non zero csrcs and certain extensions.

webrtc/modules/rtp_rtcp/source/rtp_sender.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1438 matching lines @@
   int extension_block_pos =
       rtp_header_extension_map_.GetLengthUntilBlockStartInBytes(type);
   if (extension_block_pos < 0) {
     LOG(LS_WARNING) << "Failed to find extension position for " << type
                     << " as it is not registered.";
     return false;
   }
 
   HeaderExtension header_extension(type);
 
-  size_t block_pos =
-      kRtpHeaderLength + rtp_header.numCSRCs + extension_block_pos;
+  size_t extension_pos =
+      kRtpHeaderLength + rtp_header.numCSRCs * sizeof(uint32_t);
+  size_t block_pos = extension_pos + extension_block_pos;
   if (rtp_packet_length < block_pos + header_extension.length ||
       rtp_header.headerLength < block_pos + header_extension.length) {
     LOG(LS_WARNING) << "Failed to find extension position for " << type
                     << " as the length is invalid.";
     return false;
   }
 
   // Verify that header contains extension.
-  if (!((rtp_packet[kRtpHeaderLength + rtp_header.numCSRCs] == 0xBE) &&
-        (rtp_packet[kRtpHeaderLength + rtp_header.numCSRCs + 1] == 0xDE))) {
+  if (!(rtp_packet[extension_pos] == 0xBE &&
+        rtp_packet[extension_pos + 1] == 0xDE)) {
     LOG(LS_WARNING) << "Failed to find extension position for " << type
                     << "as hdr extension not found.";
     return false;
   }
 
   *position = block_pos;
   return true;
 }
 
 RTPSender::ExtensionStatus RTPSender::VerifyExtension(
     RTPExtensionType extension_type,
     uint8_t* rtp_packet,
     size_t rtp_packet_length,
     const RTPHeader& rtp_header,
     size_t extension_length_bytes,
     size_t* extension_offset) const {
   // Get id.
   uint8_t id = 0;
   if (rtp_header_extension_map_.GetId(extension_type, &id) != 0)
     return ExtensionStatus::kNotRegistered;
 
   size_t block_pos = 0;
   if (!FindHeaderExtensionPosition(extension_type, rtp_packet,
                                    rtp_packet_length, rtp_header, &block_pos))
     return ExtensionStatus::kError;
 
-  // Verify that header contains extension.
-  if (!((rtp_packet[kRtpHeaderLength + rtp_header.numCSRCs] == 0xBE) &&
-        (rtp_packet[kRtpHeaderLength + rtp_header.numCSRCs + 1] == 0xDE))) {
-    LOG(LS_WARNING)
-        << "Failed to update absolute send time, hdr extension not found.";
-    return ExtensionStatus::kError;
-  }
-
   // Verify first byte in block.
   const uint8_t first_block_byte = (id << 4) + (extension_length_bytes - 2);
   if (rtp_packet[block_pos] != first_block_byte)
     return ExtensionStatus::kError;
 
   *extension_offset = block_pos;
   return ExtensionStatus::kOk;
 }
 
 void RTPSender::UpdateTransmissionTimeOffset(uint8_t* rtp_packet,
@@ skipping 391 matching lines @@
   CriticalSectionScoped lock(send_critsect_.get());
 
   RtpState state;
   state.sequence_number = sequence_number_rtx_;
   state.start_timestamp = start_timestamp_;
 
   return state;
 }
 
 }  // namespace webrtc