From 9a925c9ce33a6ccdd11b545b11ba68e985c2a65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Tue, 5 May 2020 12:20:01 +0200 Subject: Revert "Improve outbound-rtp statistics for simulcast" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 > Reviewed-by: Erik Språng > Reviewed-by: Henrik Boström > Reviewed-by: Harald Alvestrand > Commit-Queue: Eldar Rello > 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 Commit-Queue: Henrik Boström Cr-Commit-Position: refs/heads/master@{#31165} --- pc/rtc_stats_collector.cc | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'pc/rtc_stats_collector.cc') diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc index 0e2f170ff0..01799b4283 100644 --- a/pc/rtc_stats_collector.cc +++ b/pc/rtc_stats_collector.cc @@ -397,7 +397,6 @@ void SetOutboundRTPStreamStatsFromVoiceSenderInfo( void SetOutboundRTPStreamStatsFromVideoSenderInfo( const std::string& mid, const cricket::VideoSenderInfo& video_sender_info, - bool enable_simulcast_stats, RTCOutboundRTPStreamStats* outbound_video) { SetOutboundRTPStreamStatsFromMediaSenderInfo(video_sender_info, outbound_video); @@ -422,21 +421,6 @@ void SetOutboundRTPStreamStatsFromVideoSenderInfo( rtc::kNumMillisecsPerSec; outbound_video->total_encoded_bytes_target = video_sender_info.total_encoded_bytes_target; - if (enable_simulcast_stats) { - if (video_sender_info.send_frame_width > 0) { - outbound_video->frame_width = - static_cast(video_sender_info.send_frame_width); - } - if (video_sender_info.send_frame_height > 0) { - outbound_video->frame_height = - static_cast(video_sender_info.send_frame_height); - } - if (video_sender_info.framerate_sent > 0) { - outbound_video->frames_per_second = video_sender_info.framerate_sent; - } - outbound_video->frames_sent = video_sender_info.frames_sent; - outbound_video->huge_frames_sent = video_sender_info.huge_frames_sent; - } outbound_video->total_packet_send_delay = static_cast(video_sender_info.total_packet_send_delay_ms) / rtc::kNumMillisecsPerSec; @@ -453,9 +437,6 @@ void SetOutboundRTPStreamStatsFromVideoSenderInfo( outbound_video->encoder_implementation = video_sender_info.encoder_implementation_name; } - if (video_sender_info.rid) { - outbound_video->rid = *video_sender_info.rid; - } } std::unique_ptr @@ -987,7 +968,6 @@ RTCStatsCollector::RTCStatsCollector(PeerConnectionInternal* pc, RTC_DCHECK_GE(cache_lifetime_us_, 0); pc_->SignalDataChannelCreated().connect( this, &RTCStatsCollector::OnDataChannelCreated); - enable_simulcast_stats_ = pc_->GetConfiguration().enable_simulcast_stats; } RTCStatsCollector::~RTCStatsCollector() { @@ -1663,16 +1643,14 @@ void RTCStatsCollector::ProduceVideoRTPStreamStats_n( // Outbound std::map video_outbound_rtps; for (const cricket::VideoSenderInfo& video_sender_info : - enable_simulcast_stats_ - ? track_media_info_map.video_media_info()->senders - : track_media_info_map.video_media_info()->aggregated_senders) { + track_media_info_map.video_media_info()->senders) { if (!video_sender_info.connected()) continue; auto outbound_video = std::make_unique( RTCOutboundRTPStreamStatsIDFromSSRC(false, video_sender_info.ssrc()), timestamp_us); - SetOutboundRTPStreamStatsFromVideoSenderInfo( - mid, video_sender_info, enable_simulcast_stats_, outbound_video.get()); + SetOutboundRTPStreamStatsFromVideoSenderInfo(mid, video_sender_info, + outbound_video.get()); rtc::scoped_refptr video_track = track_media_info_map.GetVideoTrack(video_sender_info); if (video_track) { -- cgit v1.2.3