Moving overhead counting to bitrate estimators.

webrtc/tools/event_log_visualizer/analyzer.cc

Index: webrtc/tools/event_log_visualizer/analyzer.cc
diff --git a/webrtc/tools/event_log_visualizer/analyzer.cc b/webrtc/tools/event_log_visualizer/analyzer.cc
index 88ca33935f44a11a10afd67497cd7ef4f6a98fc5..9594dacaf2bf8a007247b057382284062997f4a7 100644
--- a/webrtc/tools/event_log_visualizer/analyzer.cc
+++ b/webrtc/tools/event_log_visualizer/analyzer.cc
@@ -1105,7 +1105,8 @@ void EventLogAnalyzer::CreateBweSimulationGraph(Plot* plot) {
         RTC_DCHECK(rtp.header.extension.hasTransportSequenceNumber);
         cc.AddPacket(rtp.header.ssrc,
                      rtp.header.extension.transportSequenceNumber,
-                     rtp.total_length, PacedPacketInfo());
+                     rtp.total_length - rtp.header.headerLength,
+                     rtp.header.headerLength, PacedPacketInfo());
         rtc::SentPacket sent_packet(
             rtp.header.extension.transportSequenceNumber, rtp.timestamp / 1000);
         cc.OnSentPacket(sent_packet);
@@ -1205,7 +1206,8 @@ void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) {
         RTC_DCHECK(rtp.header.extension.hasTransportSequenceNumber);
         feedback_adapter.AddPacket(rtp.header.ssrc,
                                    rtp.header.extension.transportSequenceNumber,
-                                   rtp.total_length, PacedPacketInfo());
+                                   rtp.total_length - rtp.header.headerLength,
+                                   rtp.header.headerLength, PacedPacketInfo());
         feedback_adapter.OnSentPacket(
             rtp.header.extension.transportSequenceNumber, rtp.timestamp / 1000);
       }