diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h index 059fb0d68f..b542d80d7e 100644 --- a/api/stats/rtcstats_objects.h +++ b/api/stats/rtcstats_objects.h @@ -353,10 +353,6 @@ class RTC_EXPORT DEPRECATED_RTCMediaStreamTrackStats final : public RTCStats { RTCNonStandardStatsMember relative_packet_arrival_delay; RTCNonStandardStatsMember interruption_count; RTCNonStandardStatsMember total_interruption_duration; - // Non-standard video-only members. - // https://w3c.github.io/webrtc-provisional-stats/#dom-rtcvideoreceiverstats - RTCNonStandardStatsMember total_frames_duration; - RTCNonStandardStatsMember sum_squared_frame_durations; // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete them. RTCNonStandardStatsMember freeze_count; RTCNonStandardStatsMember pause_count; diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc index 483c23a50b..419cf95d9e 100644 --- a/media/engine/webrtc_video_engine.cc +++ b/media/engine/webrtc_video_engine.cc @@ -3287,8 +3287,6 @@ WebRtcVideoChannel::WebRtcVideoReceiveStream::GetVideoReceiverInfo( info.pause_count = stats.pause_count; info.total_freezes_duration_ms = stats.total_freezes_duration_ms; info.total_pauses_duration_ms = stats.total_pauses_duration_ms; - info.total_frames_duration_ms = stats.total_frames_duration_ms; - info.sum_squared_frame_durations = stats.sum_squared_frame_durations; info.content_type = stats.content_type; diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc index 4a55467c15..e3f0ebc1b3 100644 --- a/pc/rtc_stats_collector.cc +++ b/pc/rtc_stats_collector.cc @@ -1135,11 +1135,6 @@ ProduceMediaStreamTrackStatsFromVideoReceiverInfo( // value as "RTCInboundRTPStreamStats.framesDecoded". https://crbug.com/659137 video_track_stats->frames_decoded = video_receiver_info.frames_decoded; video_track_stats->frames_dropped = video_receiver_info.frames_dropped; - video_track_stats->total_frames_duration = - static_cast(video_receiver_info.total_frames_duration_ms) / - rtc::kNumMillisecsPerSec; - video_track_stats->sum_squared_frame_durations = - video_receiver_info.sum_squared_frame_durations; // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete them // from "track". diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc index 4422938990..de58a8785e 100644 --- a/pc/rtc_stats_collector_unittest.cc +++ b/pc/rtc_stats_collector_unittest.cc @@ -2388,8 +2388,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; - video_receiver_info_ssrc3.total_frames_duration_ms = 15000; - video_receiver_info_ssrc3.sum_squared_frame_durations = 1.5; // TODO(crbug.com/webrtc/14521): When removed from "track", there's no need to // test these here. video_receiver_info_ssrc3.freeze_count = 3; @@ -2441,8 +2439,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; - expected_remote_video_track_ssrc3.total_frames_duration = 15; - expected_remote_video_track_ssrc3.sum_squared_frame_durations = 1.5; // 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; diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc index d170871c64..dd87355227 100644 --- a/pc/rtc_stats_integrationtest.cc +++ b/pc/rtc_stats_integrationtest.cc @@ -595,10 +595,6 @@ class RTCStatsReportVerifier { media_stream_track.frames_decoded); verifier.TestMemberIsNonNegative( media_stream_track.frames_dropped); - verifier.TestMemberIsNonNegative( - media_stream_track.total_frames_duration); - verifier.TestMemberIsNonNegative( - media_stream_track.sum_squared_frame_durations); // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete // them from "track". verifier.TestMemberIsNonNegative( @@ -623,10 +619,6 @@ class RTCStatsReportVerifier { verifier.TestMemberIsUndefined(media_stream_track.frames_received); verifier.TestMemberIsUndefined(media_stream_track.frames_decoded); verifier.TestMemberIsUndefined(media_stream_track.frames_dropped); - verifier.TestMemberIsUndefined( - media_stream_track.total_frames_duration); - verifier.TestMemberIsUndefined( - media_stream_track.sum_squared_frame_durations); // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete // them from "track". verifier.TestMemberIsUndefined(media_stream_track.freeze_count); @@ -747,9 +739,6 @@ class RTCStatsReportVerifier { verifier.TestMemberIsUndefined(media_stream_track.frames_received); verifier.TestMemberIsUndefined(media_stream_track.frames_decoded); verifier.TestMemberIsUndefined(media_stream_track.frames_dropped); - verifier.TestMemberIsUndefined(media_stream_track.total_frames_duration); - verifier.TestMemberIsUndefined( - media_stream_track.sum_squared_frame_durations); // Audio-only members // TODO(hbos): `echo_return_loss` and `echo_return_loss_enhancement` are // flaky on msan bot (sometimes defined, sometimes undefined). Should the diff --git a/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc index 420613b777..28a956acc5 100644 --- a/stats/rtcstats_objects.cc +++ b/stats/rtcstats_objects.cc @@ -370,8 +370,6 @@ WEBRTC_RTCSTATS_IMPL(DEPRECATED_RTCMediaStreamTrackStats, RTCStats, "track", &relative_packet_arrival_delay, &interruption_count, &total_interruption_duration, - &total_frames_duration, - &sum_squared_frame_durations, &freeze_count, &pause_count, &total_freezes_duration, @@ -428,8 +426,6 @@ DEPRECATED_RTCMediaStreamTrackStats::DEPRECATED_RTCMediaStreamTrackStats( {NonStandardGroupId::kRtcStatsRelativePacketArrivalDelay}), interruption_count("interruptionCount"), total_interruption_duration("totalInterruptionDuration"), - total_frames_duration("totalFramesDuration"), - sum_squared_frame_durations("sumOfSquaredFramesDuration"), freeze_count("freezeCount"), pause_count("pauseCount"), total_freezes_duration("totalFreezesDuration"),