Reland "Fix GetStats bytesSent/Received, wireup headerBytesSent/Received"
This is a reland of fbde32e596f06893d6dda13eb7d29f4c251cf08b
The chromium problem should be fixed with
https://chromium-review.googlesource.com/c/chromium/src/+/1862437
Original change's description:
> Fix GetStats bytesSent/Received, wireup headerBytesSent/Received
>
> Changes the standard GetStats, legacy GetStats unchanged.
>
> Bug: webrtc:10525
> Change-Id: Ie10fe8079f1d8b4cc6bbe513f6a2fc91477b5441
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/156084
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#29462}
Tbr: kwiberg@webrtc.org
Bug: webrtc:10525
Change-Id: I3b61f9535aa3f1fca2ed84f068233803d4ec9fe2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/157045
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29485}
diff --git a/pc/stats_collector_unittest.cc b/pc/stats_collector_unittest.cc
index a06b322..c6b57c2 100644
--- a/pc/stats_collector_unittest.cc
+++ b/pc/stats_collector_unittest.cc
@@ -324,7 +324,9 @@
EXPECT_EQ(rtc::ToString(info.audio_level), value_in_report);
EXPECT_TRUE(GetValue(report, StatsReport::kStatsValueNameBytesReceived,
&value_in_report));
- EXPECT_EQ(rtc::ToString(info.bytes_rcvd), value_in_report);
+ EXPECT_EQ(rtc::ToString(info.payload_bytes_rcvd +
+ info.header_and_padding_bytes_rcvd),
+ value_in_report);
EXPECT_TRUE(GetValue(report, StatsReport::kStatsValueNameJitterReceived,
&value_in_report));
EXPECT_EQ(rtc::ToString(info.jitter_ms), value_in_report);
@@ -397,7 +399,9 @@
EXPECT_EQ(sinfo.codec_name, value_in_report);
EXPECT_TRUE(GetValue(report, StatsReport::kStatsValueNameBytesSent,
&value_in_report));
- EXPECT_EQ(rtc::ToString(sinfo.bytes_sent), value_in_report);
+ EXPECT_EQ(rtc::ToString(sinfo.payload_bytes_sent +
+ sinfo.header_and_padding_bytes_sent),
+ value_in_report);
EXPECT_TRUE(GetValue(report, StatsReport::kStatsValueNamePacketsSent,
&value_in_report));
EXPECT_EQ(rtc::ToString(sinfo.packets_sent), value_in_report);
@@ -528,7 +532,8 @@
uint32_t ssrc = kSsrcOfTrack) {
voice_sender_info->add_ssrc(ssrc);
voice_sender_info->codec_name = "fake_codec";
- voice_sender_info->bytes_sent = 100;
+ voice_sender_info->payload_bytes_sent = 88;
+ voice_sender_info->header_and_padding_bytes_sent = 12;
voice_sender_info->packets_sent = 101;
voice_sender_info->rtt_ms = 102;
voice_sender_info->fraction_lost = 103;
@@ -563,7 +568,8 @@
void InitVoiceReceiverInfo(cricket::VoiceReceiverInfo* voice_receiver_info) {
voice_receiver_info->add_ssrc(kSsrcOfTrack);
- voice_receiver_info->bytes_rcvd = 110;
+ voice_receiver_info->payload_bytes_rcvd = 98;
+ voice_receiver_info->header_and_padding_bytes_rcvd = 12;
voice_receiver_info->packets_rcvd = 111;
voice_receiver_info->packets_lost = 114;
voice_receiver_info->jitter_ms = 116;
@@ -904,7 +910,8 @@
VideoSenderInfo video_sender_info;
video_sender_info.add_ssrc(1234);
- video_sender_info.bytes_sent = kBytesSent;
+ video_sender_info.payload_bytes_sent = kBytesSent;
+ video_sender_info.header_and_padding_bytes_sent = 0;
VideoMediaInfo video_info;
video_info.senders.push_back(video_sender_info);
@@ -936,7 +943,8 @@
VoiceSenderInfo voice_sender_info;
voice_sender_info.add_ssrc(1234);
- voice_sender_info.bytes_sent = kBytesSent;
+ voice_sender_info.payload_bytes_sent = kBytesSent - 12;
+ voice_sender_info.header_and_padding_bytes_sent = 12;
VoiceMediaInfo voice_info;
voice_info.senders.push_back(voice_sender_info);
@@ -984,7 +992,9 @@
VideoSenderInfo video_sender_info;
video_sender_info.add_ssrc(1234);
- video_sender_info.bytes_sent = kBytesSent;
+ video_sender_info.payload_bytes_sent = kBytesSent - 12;
+ video_sender_info.header_and_padding_bytes_sent = 12;
+
VideoMediaInfo video_info;
video_info.senders.push_back(video_sender_info);
@@ -1081,7 +1091,8 @@
VideoSenderInfo video_sender_info;
video_sender_info.add_ssrc(1234);
- video_sender_info.bytes_sent = kBytesSent;
+ video_sender_info.payload_bytes_sent = kBytesSent - 12;
+ video_sender_info.header_and_padding_bytes_sent = 12;
VideoMediaInfo video_info;
video_info.senders.push_back(video_sender_info);
@@ -1135,7 +1146,8 @@
VideoSenderInfo video_sender_info;
video_sender_info.add_ssrc(1234);
- video_sender_info.bytes_sent = kBytesSent;
+ video_sender_info.payload_bytes_sent = kBytesSent - 12;
+ video_sender_info.header_and_padding_bytes_sent = 12;
VideoMediaInfo video_info;
video_info.senders.push_back(video_sender_info);
