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

webrtc/modules/rtp_rtcp/source/rtp_packet_history.h

 /*
  *  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 31 matching lines @@
   // Returns nullptr if packet is not found.
   // |min_elapsed_time_ms| is the minimum time that must have elapsed since
   // the last time the packet was resent (parameter is ignored if set to zero).
   // If the packet is found but the minimum time has not elapsed, returns
   // nullptr.
   std::unique_ptr<RtpPacketToSend> GetPacketAndSetSendTime(
       uint16_t sequence_number,
       int64_t min_elapsed_time_ms,
       bool retransmit);
 
+  // Gets the packet, of which the size is closest to |packet_size|.
   std::unique_ptr<RtpPacketToSend> GetBestFittingPacket(
-      size_t packet_size) const;
+      size_t packet_size) const {
+    return GetBestFittingPacket(packet_size, true);
+  }
+
+  // Gets the best fitting packet. When |include_header| is true, it gets the
+  // packet of which the total size is closest to |packet_size|, otherwise, it
+  // fits the payload size.
+  // TODO(minyue): Remove this method when we start to always include header.
+  std::unique_ptr<RtpPacketToSend> GetBestFittingPacket(
+      size_t packet_size,
+      bool include_header) const;
 
   bool HasRtpPacket(uint16_t sequence_number) const;
 
  private:
   struct StoredPacket {
     uint16_t sequence_number = 0;
     int64_t send_time = 0;
     StorageType storage_type = kDontRetransmit;
     bool has_been_retransmitted = false;
 
     std::unique_ptr<RtpPacketToSend> packet;
   };
 
   std::unique_ptr<RtpPacketToSend> GetPacket(int index) const
       EXCLUSIVE_LOCKS_REQUIRED(critsect_);
   void Allocate(size_t number_to_store) EXCLUSIVE_LOCKS_REQUIRED(critsect_);
   void Free() EXCLUSIVE_LOCKS_REQUIRED(critsect_);
   bool FindSeqNum(uint16_t sequence_number, int* index) const
       EXCLUSIVE_LOCKS_REQUIRED(critsect_);
-  int FindBestFittingPacket(size_t size) const
+  int FindBestFittingPacket(size_t size, bool include_header) const
       EXCLUSIVE_LOCKS_REQUIRED(critsect_);
 
   Clock* clock_;
   rtc::CriticalSection critsect_;
   bool store_ GUARDED_BY(critsect_);
   uint32_t prev_index_ GUARDED_BY(critsect_);
   std::vector<StoredPacket> stored_packets_ GUARDED_BY(critsect_);
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpPacketHistory);
 };
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_HISTORY_H_