diff --git a/api/call/call_factory_interface.h b/api/call/call_factory_interface.h index 1c12352aac..db53d724a6 100644 --- a/api/call/call_factory_interface.h +++ b/api/call/call_factory_interface.h @@ -34,7 +34,9 @@ class CallFactoryInterface { virtual std::unique_ptr CreateCall(const CallConfig& config) = 0; }; -RTC_EXPORT std::unique_ptr CreateCallFactory(); +[[deprecated("bugs.webrtc.org/15574")]] // +RTC_EXPORT std::unique_ptr +CreateCallFactory(); } // namespace webrtc diff --git a/api/peer_connection_interface.cc b/api/peer_connection_interface.cc index dedfd355d6..33d9755c7a 100644 --- a/api/peer_connection_interface.cc +++ b/api/peer_connection_interface.cc @@ -60,8 +60,13 @@ PeerConnectionDependencies::~PeerConnectionDependencies() = default; PeerConnectionFactoryDependencies::PeerConnectionFactoryDependencies() = default; +// TODO(bugs.webrtc.org/15574): Remove pragma once call_factory and media_engine +// are removed from PeerConnectionFactoryDependencies +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" PeerConnectionFactoryDependencies::PeerConnectionFactoryDependencies( PeerConnectionFactoryDependencies&&) = default; +#pragma clang diagnostic pop PeerConnectionFactoryDependencies::~PeerConnectionFactoryDependencies() = default; diff --git a/api/peer_connection_interface.h b/api/peer_connection_interface.h index fed5474814..8977137f65 100644 --- a/api/peer_connection_interface.h +++ b/api/peer_connection_interface.h @@ -1432,10 +1432,10 @@ struct RTC_EXPORT PeerConnectionFactoryDependencies final { // called without a `port_allocator`. std::unique_ptr packet_socket_factory; std::unique_ptr task_queue_factory; - // TODO(bugs.webrtc.org/15574): Deprecate `media_engine` and `call_factory` - // when chromium and webrtc are updated to use `media_factory` instead. - std::unique_ptr media_engine; - std::unique_ptr call_factory; + // TODO(bugs.webrtc.org/15574): Delete `media_engine` and `call_factory` + // after 2023-12-01 + [[deprecated]] std::unique_ptr media_engine; + [[deprecated]] std::unique_ptr call_factory; std::unique_ptr event_log_factory; std::unique_ptr fec_controller_factory; std::unique_ptr diff --git a/media/engine/webrtc_media_engine.h b/media/engine/webrtc_media_engine.h index fa4046bca8..0dee7aef37 100644 --- a/media/engine/webrtc_media_engine.h +++ b/media/engine/webrtc_media_engine.h @@ -63,10 +63,9 @@ struct MediaEngineDependencies { // CreateMediaEngine may be called on any thread, though the engine is // only expected to be used on one thread, internally called the "worker // thread". This is the thread Init must be called on. -// TODO(bugs.webrtc.org/15574): Deprecate this helper in favor of creating -// media engine with `PeerConnectionFactoryDependencies::media_factory`. -RTC_EXPORT std::unique_ptr CreateMediaEngine( - MediaEngineDependencies dependencies); +[[deprecated("bugs.webrtc.org/15574")]] // +RTC_EXPORT std::unique_ptr +CreateMediaEngine(MediaEngineDependencies dependencies); // Verify that extension IDs are within 1-byte extension range and are not // overlapping, and that they form a legal change from previously registerd diff --git a/media/engine/webrtc_media_engine_unittest.cc b/media/engine/webrtc_media_engine_unittest.cc index 738ce45972..b89c98fe5e 100644 --- a/media/engine/webrtc_media_engine_unittest.cc +++ b/media/engine/webrtc_media_engine_unittest.cc @@ -322,6 +322,9 @@ TEST(WebRtcMediaEngineTest, FilterRtpExtensionsRemoveRedundantBwe3) { EXPECT_EQ(RtpExtension::kTimestampOffsetUri, filtered[0].uri); } +// Deprecated as part of the bugs.webrtc.org/15574 effort. +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" TEST(WebRtcMediaEngineTest, Create) { MediaEngineDependencies deps; webrtc::DeprecatedSetMediaEngineDefaults(&deps); @@ -333,5 +336,6 @@ TEST(WebRtcMediaEngineTest, Create) { EXPECT_TRUE(engine); } +#pragma clang diagnostic pop } // namespace cricket diff --git a/pc/connection_context.cc b/pc/connection_context.cc index 1347008f5a..09d4b4aa39 100644 --- a/pc/connection_context.cc +++ b/pc/connection_context.cc @@ -79,12 +79,17 @@ std::unique_ptr MaybeCreateSctpFactory( // Static rtc::scoped_refptr ConnectionContext::Create( PeerConnectionFactoryDependencies* dependencies) { +// TODO(bugs.webrtc.org/15574): Remove when call_factory and media_engine +// are removed from PeerConnectionFactoryDependencies +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" if (dependencies->media_factory != nullptr) { RTC_CHECK(dependencies->media_engine == nullptr) << "media_factory replaces media_engine. Do not set media_engine."; RTC_CHECK(dependencies->call_factory == nullptr) << "media_factory replaces call_factory. Do not set call_factory."; } +#pragma clang diagnostic pop return rtc::scoped_refptr( new ConnectionContext(dependencies)); @@ -109,13 +114,19 @@ ConnectionContext::ConnectionContext( media_engine_( dependencies->media_factory != nullptr ? dependencies->media_factory->CreateMediaEngine(*dependencies) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" : std::move(dependencies->media_engine)), +#pragma clang diagnostic pop network_monitor_factory_( std::move(dependencies->network_monitor_factory)), default_network_manager_(std::move(dependencies->network_manager)), call_factory_(dependencies->media_factory != nullptr ? std::move(dependencies->media_factory) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" : std::move(dependencies->call_factory)), +#pragma clang diagnostic pop default_socket_factory_(std::move(dependencies->packet_socket_factory)), sctp_factory_( MaybeCreateSctpFactory(std::move(dependencies->sctp_factory),