commit c57a28c46bd2b831ed870f1c8d9f54b7d0b68399
author Henrik Boström <hbos@webrtc.org> Thu Oct 06 11:59:05 2022 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 06 10:52:22 2022 +0000
tree b4df07a87e3457c8363ac6300eefdc515ea8c197
parent 7fe7091f8a75364a689f7a09a1a8ffe566082961

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}

stats/rtcstats_objects.cc

diff --git a/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc
index 691acf3..3e0ea47 100644
--- a/stats/rtcstats_objects.cc
+++ b/stats/rtcstats_objects.cc
@@ -430,12 +430,12 @@
                      &relative_packet_arrival_delay,
                      &interruption_count,
                      &total_interruption_duration,
+                     &total_frames_duration,
+                     &sum_squared_frame_durations,
                      &freeze_count,
                      &pause_count,
                      &total_freezes_duration,
-                     &total_pauses_duration,
-                     &total_frames_duration,
-                     &sum_squared_frame_durations)
+                     &total_pauses_duration)
 // clang-format on
 
 RTCMediaStreamTrackStats::RTCMediaStreamTrackStats(const std::string& id,
@@ -485,12 +485,12 @@
           {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"),
-      total_pauses_duration("totalPausesDuration"),
-      total_frames_duration("totalFramesDuration"),
-      sum_squared_frame_durations("sumOfSquaredFramesDuration") {
+      total_pauses_duration("totalPausesDuration") {
   RTC_DCHECK(kind == RTCMediaStreamTrackKind::kAudio ||
              kind == RTCMediaStreamTrackKind::kVideo);
 }
@@ -530,12 +530,12 @@
       relative_packet_arrival_delay(other.relative_packet_arrival_delay),
       interruption_count(other.interruption_count),
       total_interruption_duration(other.total_interruption_duration),
+      total_frames_duration(other.total_frames_duration),
+      sum_squared_frame_durations(other.sum_squared_frame_durations),
       freeze_count(other.freeze_count),
       pause_count(other.pause_count),
       total_freezes_duration(other.total_freezes_duration),
-      total_pauses_duration(other.total_pauses_duration),
-      total_frames_duration(other.total_frames_duration),
-      sum_squared_frame_durations(other.sum_squared_frame_durations) {}
+      total_pauses_duration(other.total_pauses_duration) {}
 
 RTCMediaStreamTrackStats::~RTCMediaStreamTrackStats() {}
 
@@ -685,6 +685,10 @@
     &frames_assembled_from_multiple_packets,
     &total_inter_frame_delay,
     &total_squared_inter_frame_delay,
+    &pause_count,
+    &total_pauses_duration,
+    &freeze_count,
+    &total_freezes_duration,
     &content_type,
     &estimated_playout_timestamp,
     &decoder_implementation,
@@ -739,6 +743,10 @@
           "framesAssembledFromMultiplePackets"),
       total_inter_frame_delay("totalInterFrameDelay"),
       total_squared_inter_frame_delay("totalSquaredInterFrameDelay"),
+      pause_count("pauseCount"),
+      total_pauses_duration("totalPausesDuration"),
+      freeze_count("freezeCount"),
+      total_freezes_duration("totalFreezesDuration"),
       content_type("contentType"),
       estimated_playout_timestamp("estimatedPlayoutTimestamp"),
       decoder_implementation("decoderImplementation"),
@@ -789,6 +797,10 @@
           other.frames_assembled_from_multiple_packets),
       total_inter_frame_delay(other.total_inter_frame_delay),
       total_squared_inter_frame_delay(other.total_squared_inter_frame_delay),
+      pause_count(other.pause_count),
+      total_pauses_duration(other.total_pauses_duration),
+      freeze_count(other.freeze_count),
+      total_freezes_duration(other.total_freezes_duration),
       content_type(other.content_type),
       estimated_playout_timestamp(other.estimated_playout_timestamp),
       decoder_implementation(other.decoder_implementation),