Reland "Improve outbound-rtp statistics for simulcast"
This reverts commit 9a925c9ce33a6ccdd11b545b11ba68e985c2a65d.
Reason for revert: The original CL is updated in PS #2 to
fix the googRtt issue which was that when the legacy sender
stats were put in "aggregated_senders" we forgot to update
rtt_ms the same way that we do it for "senders".
Original change's description:
> Revert "Improve outbound-rtp statistics for simulcast"
>
> This reverts commit da6cda839dac7d9d18eba8d365188fa94831e0b1.
>
> Reason for revert: Breaks googRtt in legacy getStats API
>
> Original change's description:
> > Improve outbound-rtp statistics for simulcast
> >
> > Bug: webrtc:9547
> > Change-Id: Iec4eb976aa11ee743805425bedb77dcea7c2c9be
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168120
> > Reviewed-by: Sebastian Jansson <srte@webrtc.org>
> > Reviewed-by: Erik Språng <sprang@webrtc.org>
> > Reviewed-by: Henrik Boström <hbos@webrtc.org>
> > Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> > Commit-Queue: Eldar Rello <elrello@microsoft.com>
> > Cr-Commit-Position: refs/heads/master@{#31097}
>
> TBR=hbos@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,srte@webrtc.org,hta@webrtc.org,elrello@microsoft.com
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: webrtc:9547
> Change-Id: I06673328c2a5293a7eef03b3aaf2ded9d13df1b3
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174443
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#31165}
TBR=hbos@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,srte@webrtc.org,hta@webrtc.org,elrello@microsoft.com
# Not skipping CQ checks because this is a reland.
Bug: webrtc:9547
Change-Id: I723744c496c3c65f95ab6a8940862c8b9f544338
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174480
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31169}
diff --git a/pc/stats_collector_unittest.cc b/pc/stats_collector_unittest.cc
index 471f382..ab46972 100644
--- a/pc/stats_collector_unittest.cc
+++ b/pc/stats_collector_unittest.cc
@@ -912,7 +912,7 @@
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);
+ video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
@@ -995,7 +995,7 @@
video_sender_info.header_and_padding_bytes_sent = 12;
VideoMediaInfo video_info;
- video_info.senders.push_back(video_sender_info);
+ video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
@@ -1093,7 +1093,7 @@
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);
+ video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
@@ -1148,7 +1148,7 @@
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);
+ video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
@@ -1211,7 +1211,7 @@
video_sender_info.add_ssrc(kSsrcOfTrack);
video_sender_info.remote_stats.push_back(remote_ssrc_stats);
VideoMediaInfo video_info;
- video_info.senders.push_back(video_sender_info);
+ video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
@@ -1853,7 +1853,7 @@
video_sender_info.frames_encoded = 10;
video_sender_info.qp_sum = 11;
VideoMediaInfo video_info;
- video_info.senders.push_back(video_sender_info);
+ video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
