From 979b0479a12b1cfa763eb8008ea226a2ff9401f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Wed, 24 May 2023 12:59:07 +0000 Subject: [PATCH] Revert "Temporarily add dummy trackId to unblock roll." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3df4178d5966f9e2c9cb3bd97f27d7e86314ddb4. Reason for revert: This dummy variable is no longer needed to make importer happy Original change's description: > Temporarily add dummy trackId to unblock roll. > > NOTRY=True > > Bug: webrtc:15198 > Change-Id: I3090b90c549da3f2368001f2049bbf1d66042af4 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/306400 > Reviewed-by: Markus Handell > Commit-Queue: Henrik Boström > Cr-Commit-Position: refs/heads/main@{#40130} Bug: webrtc:15198 Change-Id: Ib47471259de72771292887050d1576707a473eec No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/306401 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Commit-Queue: Markus Handell Reviewed-by: Markus Handell Auto-Submit: Henrik Boström Cr-Commit-Position: refs/heads/main@{#40135} --- api/stats/rtcstats_objects.h | 8 -------- stats/rtcstats_objects.cc | 6 ++---- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h index 9adf48b6a7..38aa57b48f 100644 --- a/api/stats/rtcstats_objects.h +++ b/api/stats/rtcstats_objects.h @@ -428,10 +428,6 @@ class RTC_EXPORT RTCInboundRtpStreamStats final // The former googMinPlayoutDelayMs (in seconds). RTCNonStandardStatsMember min_playout_delay; - - // Temporarily added to unblock a roll. - // TODO(https://crbug.com/webrtc/15198): Delete this. - RTCStatsMember track_id; }; // https://w3c.github.io/webrtc-stats/#outboundrtpstats-dict* @@ -483,10 +479,6 @@ class RTC_EXPORT RTCOutboundRtpStreamStats final RTCRestrictedStatsMember power_efficient_encoder; RTCStatsMember scalability_mode; - - // Temporarily added to unblock a roll. - // TODO(https://crbug.com/webrtc/15198): Delete this. - RTCStatsMember track_id; }; // https://w3c.github.io/webrtc-stats/#remoteinboundrtpstats-dict* diff --git a/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc index 888a77b37e..67cb1c58f2 100644 --- a/stats/rtcstats_objects.cc +++ b/stats/rtcstats_objects.cc @@ -486,8 +486,7 @@ RTCInboundRtpStreamStats::RTCInboundRtpStreamStats(std::string id, relative_packet_arrival_delay("relativePacketArrivalDelay"), interruption_count("interruptionCount"), total_interruption_duration("totalInterruptionDuration"), - min_playout_delay("minPlayoutDelay"), - track_id("trackId") {} + min_playout_delay("minPlayoutDelay") {} RTCInboundRtpStreamStats::RTCInboundRtpStreamStats( const RTCInboundRtpStreamStats& other) = default; @@ -561,8 +560,7 @@ RTCOutboundRtpStreamStats::RTCOutboundRtpStreamStats(std::string id, qp_sum("qpSum"), active("active"), power_efficient_encoder("powerEfficientEncoder"), - scalability_mode("scalabilityMode"), - track_id("trackId") {} + scalability_mode("scalabilityMode") {} RTCOutboundRtpStreamStats::RTCOutboundRtpStreamStats( const RTCOutboundRtpStreamStats& other) = default;