From 3df4178d5966f9e2c9cb3bd97f27d7e86314ddb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= <hbos@webrtc.org>
Date: Wed, 24 May 2023 14:51:02 +0200
Subject: [PATCH] Temporarily add dummy trackId to unblock roll.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NOTRY=True

Bug: webrtc:15198
Change-Id: I3090b90c549da3f2368001f2049bbf1d66042af4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/306400
Reviewed-by: Markus Handell <handellm@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40130}
---
 api/stats/rtcstats_objects.h | 8 ++++++++
 stats/rtcstats_objects.cc    | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h
index 38aa57b48f..9adf48b6a7 100644
--- a/api/stats/rtcstats_objects.h
+++ b/api/stats/rtcstats_objects.h
@@ -428,6 +428,10 @@ class RTC_EXPORT RTCInboundRtpStreamStats final
 
   // The former googMinPlayoutDelayMs (in seconds).
   RTCNonStandardStatsMember<double> min_playout_delay;
+
+  // Temporarily added to unblock a roll.
+  // TODO(https://crbug.com/webrtc/15198): Delete this.
+  RTCStatsMember<std::string> track_id;
 };
 
 // https://w3c.github.io/webrtc-stats/#outboundrtpstats-dict*
@@ -479,6 +483,10 @@ class RTC_EXPORT RTCOutboundRtpStreamStats final
   RTCRestrictedStatsMember<bool, StatExposureCriteria::kHardwareCapability>
       power_efficient_encoder;
   RTCStatsMember<std::string> scalability_mode;
+
+  // Temporarily added to unblock a roll.
+  // TODO(https://crbug.com/webrtc/15198): Delete this.
+  RTCStatsMember<std::string> track_id;
 };
 
 // https://w3c.github.io/webrtc-stats/#remoteinboundrtpstats-dict*
diff --git a/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc
index 0fb58115f4..adf3f8c18e 100644
--- a/stats/rtcstats_objects.cc
+++ b/stats/rtcstats_objects.cc
@@ -493,7 +493,8 @@ RTCInboundRtpStreamStats::RTCInboundRtpStreamStats(std::string id,
           {NonStandardGroupId::kRtcStatsRelativePacketArrivalDelay}),
       interruption_count("interruptionCount"),
       total_interruption_duration("totalInterruptionDuration"),
-      min_playout_delay("minPlayoutDelay") {}
+      min_playout_delay("minPlayoutDelay"),
+      track_id("trackId") {}
 
 RTCInboundRtpStreamStats::RTCInboundRtpStreamStats(
     const RTCInboundRtpStreamStats& other) = default;
@@ -567,7 +568,8 @@ RTCOutboundRtpStreamStats::RTCOutboundRtpStreamStats(std::string id,
       qp_sum("qpSum"),
       active("active"),
       power_efficient_encoder("powerEfficientEncoder"),
-      scalability_mode("scalabilityMode") {}
+      scalability_mode("scalabilityMode"),
+      track_id("trackId") {}
 
 RTCOutboundRtpStreamStats::RTCOutboundRtpStreamStats(
     const RTCOutboundRtpStreamStats& other) = default;