From adbcbf73fa71f160074384eaa6d3fc13b54aa4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Mon, 31 Oct 2022 16:31:40 +0100 Subject: [PATCH] =?UTF-8?q?[Stats]=C2=A0Delete=20'track'=20metrics=20that?= =?UTF-8?q?=20have=20previously=20been=20moved.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These have all been moved to "inbound-rtp" and now that upstream projects have migrated we can delete the old location. Unblocks https://crbug.com/webrtc/14175 Bug: webrtc:14521, webrtc:14524 Change-Id: Ia2bfa399d62304cc0ead0e65c340dfad20acc530 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/281183 Reviewed-by: Harald Alvestrand Auto-Submit: Henrik Boström Commit-Queue: Harald Alvestrand Commit-Queue: Henrik Boström Cr-Commit-Position: refs/heads/main@{#38532} --- api/stats/rtcstats_objects.h | 11 ------ pc/rtc_stats_collector.cc | 27 -------------- pc/rtc_stats_collector_unittest.cc | 25 ------------- pc/rtc_stats_integrationtest.cc | 57 ------------------------------ stats/rtcstats_objects.cc | 29 ++------------- 5 files changed, 2 insertions(+), 147 deletions(-) diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h index b542d80d7e..f103b1d882 100644 --- a/api/stats/rtcstats_objects.h +++ b/api/stats/rtcstats_objects.h @@ -347,17 +347,6 @@ class RTC_EXPORT DEPRECATED_RTCMediaStreamTrackStats final : public RTCStats { RTCStatsMember concealment_events; RTCStatsMember inserted_samples_for_deceleration; RTCStatsMember removed_samples_for_acceleration; - // TODO(crbug.com/webrtc/14524): These metrics have been moved, delete them. - RTCNonStandardStatsMember jitter_buffer_flushes; - RTCNonStandardStatsMember delayed_packet_outage_samples; - RTCNonStandardStatsMember relative_packet_arrival_delay; - RTCNonStandardStatsMember interruption_count; - RTCNonStandardStatsMember total_interruption_duration; - // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete them. - RTCNonStandardStatsMember freeze_count; - RTCNonStandardStatsMember pause_count; - RTCNonStandardStatsMember total_freezes_duration; - RTCNonStandardStatsMember total_pauses_duration; }; using RTCMediaStreamTrackStats [[deprecated("bugs.webrtc.org/14175")]] = DEPRECATED_RTCMediaStreamTrackStats; diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc index e3f0ebc1b3..da089d4588 100644 --- a/pc/rtc_stats_collector.cc +++ b/pc/rtc_stats_collector.cc @@ -1054,22 +1054,6 @@ ProduceMediaStreamTrackStatsFromVoiceReceiverInfo( audio_track_stats->concealment_events = voice_receiver_info.concealment_events; - // TODO(crbug.com/webrtc/14524): These metrics have been moved from "track" - // stats, delete them. - audio_track_stats->jitter_buffer_flushes = - voice_receiver_info.jitter_buffer_flushes; - audio_track_stats->delayed_packet_outage_samples = - voice_receiver_info.delayed_packet_outage_samples; - audio_track_stats->relative_packet_arrival_delay = - voice_receiver_info.relative_packet_arrival_delay_seconds; - audio_track_stats->interruption_count = - voice_receiver_info.interruption_count >= 0 - ? voice_receiver_info.interruption_count - : 0; - audio_track_stats->total_interruption_duration = - static_cast(voice_receiver_info.total_interruption_duration_ms) / - rtc::kNumMillisecsPerSec; - return audio_track_stats; } @@ -1136,17 +1120,6 @@ ProduceMediaStreamTrackStatsFromVideoReceiverInfo( video_track_stats->frames_decoded = video_receiver_info.frames_decoded; video_track_stats->frames_dropped = video_receiver_info.frames_dropped; - // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete them - // from "track". - video_track_stats->freeze_count = video_receiver_info.freeze_count; - video_track_stats->pause_count = video_receiver_info.pause_count; - video_track_stats->total_freezes_duration = - static_cast(video_receiver_info.total_freezes_duration_ms) / - rtc::kNumMillisecsPerSec; - video_track_stats->total_pauses_duration = - static_cast(video_receiver_info.total_pauses_duration_ms) / - rtc::kNumMillisecsPerSec; - return video_track_stats; } diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc index de58a8785e..7deb31aea6 100644 --- a/pc/rtc_stats_collector_unittest.cc +++ b/pc/rtc_stats_collector_unittest.cc @@ -2239,13 +2239,6 @@ TEST_F(RTCStatsCollectorTest, voice_receiver_info.silent_concealed_samples = 765; voice_receiver_info.jitter_buffer_delay_seconds = 3.456; voice_receiver_info.jitter_buffer_emitted_count = 13; - // TODO(crbug.com/webrtc/14524): These metrics have been moved from "track" - // stats, no need to test these here. - voice_receiver_info.jitter_buffer_flushes = 7; - voice_receiver_info.delayed_packet_outage_samples = 15; - voice_receiver_info.relative_packet_arrival_delay_seconds = 16; - voice_receiver_info.interruption_count = 7788; - voice_receiver_info.total_interruption_duration_ms = 778899; stats_->CreateMockRtpSendersReceiversAndChannels( {}, {std::make_pair(remote_audio_track.get(), voice_receiver_info)}, {}, @@ -2286,13 +2279,6 @@ TEST_F(RTCStatsCollectorTest, expected_remote_audio_track.silent_concealed_samples = 765; expected_remote_audio_track.jitter_buffer_delay = 3.456; expected_remote_audio_track.jitter_buffer_emitted_count = 13; - // TODO(crbug.com/webrtc/14524): These metrics have been moved from "track" - // stats, delete them. - expected_remote_audio_track.jitter_buffer_flushes = 7; - expected_remote_audio_track.delayed_packet_outage_samples = 15; - expected_remote_audio_track.relative_packet_arrival_delay = 16; - expected_remote_audio_track.interruption_count = 7788; - expected_remote_audio_track.total_interruption_duration = 778.899; ASSERT_TRUE(report->Get(expected_remote_audio_track.id())); EXPECT_EQ(expected_remote_audio_track, report->Get(expected_remote_audio_track.id()) @@ -2388,12 +2374,6 @@ TEST_F(RTCStatsCollectorTest, video_receiver_info_ssrc3.frames_decoded = 995; video_receiver_info_ssrc3.frames_dropped = 10; video_receiver_info_ssrc3.frames_rendered = 990; - // TODO(crbug.com/webrtc/14521): When removed from "track", there's no need to - // test these here. - video_receiver_info_ssrc3.freeze_count = 3; - video_receiver_info_ssrc3.pause_count = 2; - video_receiver_info_ssrc3.total_freezes_duration_ms = 1000; - video_receiver_info_ssrc3.total_pauses_duration_ms = 10000; stats_->CreateMockRtpSendersReceiversAndChannels( {}, {}, {}, @@ -2439,11 +2419,6 @@ TEST_F(RTCStatsCollectorTest, expected_remote_video_track_ssrc3.frames_received = 1000; expected_remote_video_track_ssrc3.frames_decoded = 995; expected_remote_video_track_ssrc3.frames_dropped = 10; - // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete them. - expected_remote_video_track_ssrc3.freeze_count = 3; - expected_remote_video_track_ssrc3.pause_count = 2; - expected_remote_video_track_ssrc3.total_freezes_duration = 1; - expected_remote_video_track_ssrc3.total_pauses_duration = 10; ASSERT_TRUE(report->Get(expected_remote_video_track_ssrc3.id())); EXPECT_EQ(expected_remote_video_track_ssrc3, diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc index dd87355227..1a97a1e3d8 100644 --- a/pc/rtc_stats_integrationtest.cc +++ b/pc/rtc_stats_integrationtest.cc @@ -595,16 +595,6 @@ class RTCStatsReportVerifier { media_stream_track.frames_decoded); verifier.TestMemberIsNonNegative( media_stream_track.frames_dropped); - // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete - // them from "track". - verifier.TestMemberIsNonNegative( - media_stream_track.freeze_count); - verifier.TestMemberIsNonNegative( - media_stream_track.pause_count); - verifier.TestMemberIsNonNegative( - media_stream_track.total_freezes_duration); - verifier.TestMemberIsNonNegative( - media_stream_track.total_pauses_duration); } else { verifier.TestMemberIsIDReference(media_stream_track.media_source_id, RTCVideoSourceStats::kType); @@ -619,14 +609,6 @@ class RTCStatsReportVerifier { verifier.TestMemberIsUndefined(media_stream_track.frames_received); verifier.TestMemberIsUndefined(media_stream_track.frames_decoded); verifier.TestMemberIsUndefined(media_stream_track.frames_dropped); - // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete - // them from "track". - verifier.TestMemberIsUndefined(media_stream_track.freeze_count); - verifier.TestMemberIsUndefined(media_stream_track.pause_count); - verifier.TestMemberIsUndefined( - media_stream_track.total_freezes_duration); - verifier.TestMemberIsUndefined( - media_stream_track.total_pauses_duration); } // Video-only members verifier.TestMemberIsNonNegative( @@ -649,16 +631,6 @@ class RTCStatsReportVerifier { media_stream_track.inserted_samples_for_deceleration); verifier.TestMemberIsUndefined( media_stream_track.removed_samples_for_acceleration); - // TODO(crbug.com/webrtc/14524): These metrics have been moved from - // "track" stats, delete them. - verifier.TestMemberIsUndefined(media_stream_track.jitter_buffer_flushes); - verifier.TestMemberIsUndefined( - media_stream_track.delayed_packet_outage_samples); - verifier.TestMemberIsUndefined( - media_stream_track.relative_packet_arrival_delay); - verifier.TestMemberIsUndefined(media_stream_track.interruption_count); - verifier.TestMemberIsUndefined( - media_stream_track.total_interruption_duration); } else { RTC_DCHECK_EQ(*media_stream_track.kind, RTCMediaStreamTrackKind::kAudio); // The type of the referenced media source depends on kind. @@ -686,18 +658,6 @@ class RTCStatsReportVerifier { media_stream_track.inserted_samples_for_deceleration); verifier.TestMemberIsNonNegative( media_stream_track.removed_samples_for_acceleration); - // TODO(crbug.com/webrtc/14524): These metrics have been moved from - // "track" stats, delete them. - verifier.TestMemberIsNonNegative( - media_stream_track.jitter_buffer_flushes); - verifier.TestMemberIsNonNegative( - media_stream_track.delayed_packet_outage_samples); - verifier.TestMemberIsNonNegative( - media_stream_track.relative_packet_arrival_delay); - verifier.TestMemberIsNonNegative( - media_stream_track.interruption_count); - verifier.TestMemberIsNonNegative( - media_stream_track.total_interruption_duration); } else { verifier.TestMemberIsIDReference(media_stream_track.media_source_id, RTCAudioSourceStats::kType); @@ -719,17 +679,6 @@ class RTCStatsReportVerifier { media_stream_track.inserted_samples_for_deceleration); verifier.TestMemberIsUndefined( media_stream_track.removed_samples_for_acceleration); - // TODO(crbug.com/webrtc/14524): These metrics have been moved from - // "track" stats, delete them. - verifier.TestMemberIsUndefined( - media_stream_track.jitter_buffer_flushes); - verifier.TestMemberIsUndefined( - media_stream_track.delayed_packet_outage_samples); - verifier.TestMemberIsUndefined( - media_stream_track.relative_packet_arrival_delay); - verifier.TestMemberIsUndefined(media_stream_track.interruption_count); - verifier.TestMemberIsUndefined( - media_stream_track.total_interruption_duration); } // Video-only members should be undefined verifier.TestMemberIsUndefined(media_stream_track.frame_width); @@ -747,12 +696,6 @@ class RTCStatsReportVerifier { verifier.MarkMemberTested(media_stream_track.echo_return_loss, true); verifier.MarkMemberTested(media_stream_track.echo_return_loss_enhancement, true); - // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete - // them from "track". - verifier.TestMemberIsUndefined(media_stream_track.freeze_count); - verifier.TestMemberIsUndefined(media_stream_track.pause_count); - verifier.TestMemberIsUndefined(media_stream_track.total_freezes_duration); - verifier.TestMemberIsUndefined(media_stream_track.total_pauses_duration); } return verifier.ExpectAllMembersSuccessfullyTested(); } diff --git a/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc index 28a956acc5..e5c6bfa1e1 100644 --- a/stats/rtcstats_objects.cc +++ b/stats/rtcstats_objects.cc @@ -364,16 +364,7 @@ WEBRTC_RTCSTATS_IMPL(DEPRECATED_RTCMediaStreamTrackStats, RTCStats, "track", &silent_concealed_samples, &concealment_events, &inserted_samples_for_deceleration, - &removed_samples_for_acceleration, - &jitter_buffer_flushes, - &delayed_packet_outage_samples, - &relative_packet_arrival_delay, - &interruption_count, - &total_interruption_duration, - &freeze_count, - &pause_count, - &total_freezes_duration, - &total_pauses_duration) + &removed_samples_for_acceleration) // clang-format on DEPRECATED_RTCMediaStreamTrackStats::DEPRECATED_RTCMediaStreamTrackStats( @@ -413,23 +404,7 @@ DEPRECATED_RTCMediaStreamTrackStats::DEPRECATED_RTCMediaStreamTrackStats( silent_concealed_samples("silentConcealedSamples"), concealment_events("concealmentEvents"), inserted_samples_for_deceleration("insertedSamplesForDeceleration"), - removed_samples_for_acceleration("removedSamplesForAcceleration"), - jitter_buffer_flushes( - "jitterBufferFlushes", - {NonStandardGroupId::kRtcAudioJitterBufferMaxPackets}), - delayed_packet_outage_samples( - "delayedPacketOutageSamples", - {NonStandardGroupId::kRtcAudioJitterBufferMaxPackets, - NonStandardGroupId::kRtcStatsRelativePacketArrivalDelay}), - relative_packet_arrival_delay( - "relativePacketArrivalDelay", - {NonStandardGroupId::kRtcStatsRelativePacketArrivalDelay}), - interruption_count("interruptionCount"), - total_interruption_duration("totalInterruptionDuration"), - freeze_count("freezeCount"), - pause_count("pauseCount"), - total_freezes_duration("totalFreezesDuration"), - total_pauses_duration("totalPausesDuration") { + removed_samples_for_acceleration("removedSamplesForAcceleration") { RTC_DCHECK(kind == RTCMediaStreamTrackKind::kAudio || kind == RTCMediaStreamTrackKind::kVideo); }