Correcting the amount of padding when send side bwe includes RTP overhead.

webrtc/modules/rtp_rtcp/source/rtp_packet_history.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 143 matching lines @@
   stored_packets_[index].send_time = clock_->TimeInMilliseconds();
   return GetPacket(index);
 }
 
 std::unique_ptr<RtpPacketToSend> RtpPacketHistory::GetPacket(int index) const {
   const RtpPacketToSend& stored = *stored_packets_[index].packet;
   return std::unique_ptr<RtpPacketToSend>(new RtpPacketToSend(stored));
 }
 
 std::unique_ptr<RtpPacketToSend> RtpPacketHistory::GetBestFittingPacket(
-    size_t packet_length) const {
+    size_t packet_length,
+    bool include_header) const {
   rtc::CritScope cs(&critsect_);
   if (!store_)
     return nullptr;
-  int index = FindBestFittingPacket(packet_length);
+  int index = FindBestFittingPacket(packet_length, include_header);
   if (index < 0)
     return nullptr;
   return GetPacket(index);
 }
 
 bool RtpPacketHistory::FindSeqNum(uint16_t sequence_number, int* index) const {
   if (prev_index_ > 0) {
     *index = prev_index_ - 1;
   } else {
     *index = stored_packets_.size() - 1;  // Wrap.
@@ skipping 13 matching lines @@
         *index = m;
         temp_sequence_number = stored_packets_[*index].sequence_number;
         break;
       }
     }
   }
   return temp_sequence_number == sequence_number &&
          stored_packets_[*index].packet;
 }
 
-int RtpPacketHistory::FindBestFittingPacket(size_t size) const {
+int RtpPacketHistory::FindBestFittingPacket(size_t size,
+                                            bool include_header) const {
   if (size < kMinPacketRequestBytes || stored_packets_.empty())
     return -1;
   size_t min_diff = std::numeric_limits<size_t>::max();
   int best_index = -1;  // Returned unchanged if we don't find anything.
   for (size_t i = 0; i < stored_packets_.size(); ++i) {
     if (!stored_packets_[i].packet)
       continue;
-    size_t stored_size = stored_packets_[i].packet->size();
+    size_t stored_size = include_header
+                             ? stored_packets_[i].packet->size()
+                             : stored_packets_[i].packet->size() -
+                                   stored_packets_[i].packet->headers_size();
     size_t diff =
         (stored_size > size) ? (stored_size - size) : (size - stored_size);
     if (diff < min_diff) {
       min_diff = diff;
       best_index = static_cast<int>(i);
     }
   }
   return best_index;
 }
 
 }  // namespace webrtc