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

webrtc/modules/rtp_rtcp/source/rtp_packet_history.h

Index: webrtc/modules/rtp_rtcp/source/rtp_packet_history.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h
index dc2b35a375511d226ebd9af0df64809531b16d03..c39007a2f7048f0497bb82ae1a43bd13f03a8a82 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.h
@@ -49,8 +49,14 @@ class RtpPacketHistory {
       int64_t min_elapsed_time_ms,
       bool retransmit);
 
+  RTC_DEPRECATED std::unique_ptr<RtpPacketToSend> GetBestFittingPacket(

[philipel, 2017/03/30 11:52:11]

Since the long term goal is to include all headers in the BWE I think this
function should not be deprecated, but the overloaded one instead.

[minyue-webrtc, 2017/03/30 13:07:11]

good point.

But we cannot use RTC_DEPRECATED, I added a TODO instead.

+      size_t packet_size) const {
+    return GetBestFittingPacket(packet_size, true);
+  }
+
   std::unique_ptr<RtpPacketToSend> GetBestFittingPacket(

[danilchap, 2017/03/30 11:58:08]

can you add a comment what |include_header| mean in this case.
(while it is obvious in context of this CL, it doesn't look obvious without it)

-      size_t packet_size) const;
+      size_t packet_size,
+      bool include_header) const;
 
   bool HasRtpPacket(uint16_t sequence_number) const;
 
@@ -70,7 +76,7 @@ class RtpPacketHistory {
   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_;