From 65bee96054dfefb8b59c80b1fb04c7c9e4ba60c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Wed, 6 Dec 2023 16:35:17 +0100 Subject: [PATCH] Delete old "metronome" name, API users should use "decode_metronome". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that Chromium has migrated to the new name[1], "decode_metronome", we can delete the variable with the old name, "metronome". [1] https://chromium-review.googlesource.com/c/chromium/src/+/5093942 Bug: webrtc:15704 Change-Id: I50fef88a692d83e37af10956b2e12389fa601662 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/330300 Reviewed-by: Markus Handell Commit-Queue: Henrik Boström Cr-Commit-Position: refs/heads/main@{#41331} --- api/peer_connection_interface.h | 4 ---- pc/peer_connection_factory.cc | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/api/peer_connection_interface.h b/api/peer_connection_interface.h index 32aef97f1b..e8dc3ddc89 100644 --- a/api/peer_connection_interface.h +++ b/api/peer_connection_interface.h @@ -1443,10 +1443,6 @@ struct RTC_EXPORT PeerConnectionFactoryDependencies final { transport_controller_send_factory; // Metronome used for decoding, must be called on the worker thread. std::unique_ptr decode_metronome; - // Old name for `decode_metronome`. - // TODO(https://crbug.com/webrtc/15704): When callers have migrated to - // `decode_metronome`, delete this. - std::unique_ptr metronome; // Media specific dependencies. Unused when `media_factory == nullptr`. rtc::scoped_refptr adm; diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc index 7539282fcf..951da5fa44 100644 --- a/pc/peer_connection_factory.cc +++ b/pc/peer_connection_factory.cc @@ -103,9 +103,7 @@ PeerConnectionFactory::PeerConnectionFactory( (dependencies->transport_controller_send_factory) ? std::move(dependencies->transport_controller_send_factory) : std::make_unique()), - decode_metronome_(dependencies->decode_metronome - ? std::move(dependencies->decode_metronome) - : std::move(dependencies->metronome)) {} + decode_metronome_(std::move(dependencies->decode_metronome)) {} PeerConnectionFactory::PeerConnectionFactory( PeerConnectionFactoryDependencies dependencies)