Move pause and freeze metrics to standardized location.
These metrics were recently standardized. Part of the standardization
effort was to move them from obsolete "track" stats (on track for
deprecation and removal: https://crbug.com/webrtc/14175) into the
"inbound-rtp" stats which are not deprecated.
To ease transition for downstream projects, the metrics are temporarily
duplicated in both the old and new locations. In a follow-up CL, they
will be deleted from "track".
Bug: webrtc:14521
Change-Id: I0d9036472607a8c717ec823a458a79a49ddb80c7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/278080
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38308}
diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc
index 184850e..4bb8473 100644
--- a/pc/rtc_stats_integrationtest.cc
+++ b/pc/rtc_stats_integrationtest.cc
@@ -594,6 +594,12 @@
media_stream_track.frames_decoded);
verifier.TestMemberIsNonNegative<uint32_t>(
media_stream_track.frames_dropped);
+ verifier.TestMemberIsNonNegative<double>(
+ media_stream_track.total_frames_duration);
+ verifier.TestMemberIsNonNegative<double>(
+ media_stream_track.sum_squared_frame_durations);
+ // TODO(crbug.com/webrtc/14521): These metrics have been moved, delete
+ // them from "track".
verifier.TestMemberIsNonNegative<uint32_t>(
media_stream_track.freeze_count);
verifier.TestMemberIsNonNegative<uint32_t>(
@@ -602,10 +608,6 @@
media_stream_track.total_freezes_duration);
verifier.TestMemberIsNonNegative<double>(
media_stream_track.total_pauses_duration);
- verifier.TestMemberIsNonNegative<double>(
- media_stream_track.total_frames_duration);
- verifier.TestMemberIsNonNegative<double>(
- media_stream_track.sum_squared_frame_durations);
} else {
verifier.TestMemberIsIDReference(media_stream_track.media_source_id,
RTCVideoSourceStats::kType);
@@ -620,16 +622,18 @@
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);
verifier.TestMemberIsUndefined(media_stream_track.pause_count);
verifier.TestMemberIsUndefined(
media_stream_track.total_freezes_duration);
verifier.TestMemberIsUndefined(
media_stream_track.total_pauses_duration);
- verifier.TestMemberIsUndefined(
- media_stream_track.total_frames_duration);
- verifier.TestMemberIsUndefined(
- media_stream_track.sum_squared_frame_durations);
}
// Video-only members
verifier.TestMemberIsNonNegative<uint32_t>(
@@ -736,10 +740,6 @@
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.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);
verifier.TestMemberIsUndefined(media_stream_track.total_frames_duration);
verifier.TestMemberIsUndefined(
media_stream_track.sum_squared_frame_durations);
@@ -751,6 +751,12 @@
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();
}
@@ -905,6 +911,12 @@
inbound_stream.total_inter_frame_delay);
verifier.TestMemberIsNonNegative<double>(
inbound_stream.total_squared_inter_frame_delay);
+ verifier.TestMemberIsNonNegative<uint32_t>(inbound_stream.pause_count);
+ verifier.TestMemberIsNonNegative<double>(
+ inbound_stream.total_pauses_duration);
+ verifier.TestMemberIsNonNegative<uint32_t>(inbound_stream.freeze_count);
+ verifier.TestMemberIsNonNegative<double>(
+ inbound_stream.total_freezes_duration);
// The integration test is not set up to test screen share; don't require
// this to be present.
verifier.MarkMemberTested(inbound_stream.content_type, true);
@@ -922,6 +934,10 @@
verifier.TestMemberIsUndefined(inbound_stream.total_inter_frame_delay);
verifier.TestMemberIsUndefined(
inbound_stream.total_squared_inter_frame_delay);
+ verifier.TestMemberIsUndefined(inbound_stream.pause_count);
+ verifier.TestMemberIsUndefined(inbound_stream.total_pauses_duration);
+ verifier.TestMemberIsUndefined(inbound_stream.freeze_count);
+ verifier.TestMemberIsUndefined(inbound_stream.total_freezes_duration);
verifier.TestMemberIsUndefined(inbound_stream.content_type);
verifier.TestMemberIsUndefined(inbound_stream.min_playout_delay);
}