From a5cc0accfb2125590bc5ba2c36ae7786d456a4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Thu, 21 Jul 2022 10:56:52 +0200 Subject: [PATCH] Add DEPRECATED prefix to track stats IDs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no way to add a deprecation warning unique to using RTCMediaStreamTrackStats, but we could signal to users that it is deprecated by adding "DEPRECATED_" to its ID. This could break apps with hardcoded assumptions about what the stats IDs are, but apps doing this are using the API incorrectly anyway, so if anyone is affected by this change that would be a good time to remove any dependency on this (see https://crbug.com/webrtc/10656 regading the fact that IDs should be unpredictable). Bug: webrtc:14175 Change-Id: I6242c4efc08e9570420c00af5aaf491b1af819f1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/269004 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Henrik Boström Cr-Commit-Position: refs/heads/main@{#37595} --- pc/rtc_stats_collector.cc | 2 +- pc/rtc_stats_collector_unittest.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc index 4b92fb6a4b..d891733367 100644 --- a/pc/rtc_stats_collector.cc +++ b/pc/rtc_stats_collector.cc @@ -97,7 +97,7 @@ std::string RTCMediaStreamTrackStatsIDFromDirectionAndAttachment( int attachment_id) { char buf[1024]; rtc::SimpleStringBuilder sb(buf); - sb << "RTCMediaStreamTrack_" << direction << "_" << attachment_id; + sb << "DEPRECATED_RTCMediaStreamTrack_" << direction << "_" << attachment_id; return sb.str(); } diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc index 5fe4fe7a52..2fff71a1ed 100644 --- a/pc/rtc_stats_collector_unittest.cc +++ b/pc/rtc_stats_collector_unittest.cc @@ -740,12 +740,12 @@ class RTCStatsCollectorTest : public ::testing::Test { // track (sender) graph.sender = stats_->SetupLocalTrackAndSender( cricket::MEDIA_TYPE_VIDEO, "LocalVideoTrackID", 3, false, 50); - graph.sender_track_id = "RTCMediaStreamTrack_sender_" + + graph.sender_track_id = "DEPRECATED_RTCMediaStreamTrack_sender_" + rtc::ToString(graph.sender->AttachmentId()); // track (receiver) and stream (remote stream) graph.receiver = stats_->SetupRemoteTrackAndReceiver( cricket::MEDIA_TYPE_VIDEO, "RemoteVideoTrackID", "RemoteStreamId", 4); - graph.receiver_track_id = "RTCMediaStreamTrack_receiver_" + + graph.receiver_track_id = "DEPRECATED_RTCMediaStreamTrack_receiver_" + rtc::ToString(graph.receiver->AttachmentId()); graph.remote_stream_id = "RTCMediaStream_RemoteStreamId"; // peer-connection @@ -853,13 +853,13 @@ class RTCStatsCollectorTest : public ::testing::Test { // track (sender) graph.sender = stats_->SetupLocalTrackAndSender( cricket::MEDIA_TYPE_AUDIO, "LocalAudioTrackID", kLocalSsrc, false, 50); - graph.sender_track_id = "RTCMediaStreamTrack_sender_" + + graph.sender_track_id = "DEPRECATED_RTCMediaStreamTrack_sender_" + rtc::ToString(graph.sender->AttachmentId()); // track (receiver) and stream (remote stream) graph.receiver = stats_->SetupRemoteTrackAndReceiver( cricket::MEDIA_TYPE_AUDIO, "RemoteAudioTrackID", "RemoteStreamId", kRemoteSsrc); - graph.receiver_track_id = "RTCMediaStreamTrack_receiver_" + + graph.receiver_track_id = "DEPRECATED_RTCMediaStreamTrack_receiver_" + rtc::ToString(graph.receiver->AttachmentId()); graph.remote_stream_id = "RTCMediaStream_RemoteStreamId"; // peer-connection