diff --git a/media/BUILD.gn b/media/BUILD.gn index 9efdbe640c..6361fb839b 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -265,7 +265,6 @@ rtc_static_library("rtc_audio_video") { "../api/audio:audio_mixer_api", "../api/audio_codecs:audio_codecs_api", "../api/task_queue", - "../api/task_queue:global_task_queue_factory", "../api/video:video_bitrate_allocation", "../api/video:video_bitrate_allocator_factory", "../api/video:video_codec_constants", diff --git a/media/engine/webrtc_media_engine.cc b/media/engine/webrtc_media_engine.cc index 480d090157..3b3875989f 100644 --- a/media/engine/webrtc_media_engine.cc +++ b/media/engine/webrtc_media_engine.cc @@ -14,7 +14,6 @@ #include "absl/algorithm/container.h" #include "absl/memory/memory.h" -#include "api/task_queue/global_task_queue_factory.h" #include "media/engine/webrtc_voice_engine.h" #include "system_wrappers/include/field_trial.h" @@ -45,27 +44,6 @@ std::unique_ptr CreateMediaEngine( std::move(video_engine)); } -std::unique_ptr WebRtcMediaEngineFactory::Create( - rtc::scoped_refptr adm, - rtc::scoped_refptr audio_encoder_factory, - rtc::scoped_refptr audio_decoder_factory, - std::unique_ptr video_encoder_factory, - std::unique_ptr video_decoder_factory, - rtc::scoped_refptr audio_mixer, - rtc::scoped_refptr audio_processing) { -#ifdef HAVE_WEBRTC_VIDEO - auto video_engine = absl::make_unique( - std::move(video_encoder_factory), std::move(video_decoder_factory)); -#else - auto video_engine = absl::make_unique(); -#endif - return std::unique_ptr(new CompositeMediaEngine( - absl::make_unique( - &webrtc::GlobalTaskQueueFactory(), adm, audio_encoder_factory, - audio_decoder_factory, audio_mixer, audio_processing), - std::move(video_engine))); -} - namespace { // If this FieldTrial is enabled, we will not filter out the abs-send-time // header extension when the TWCC extensions were also negotiated, but keep diff --git a/media/engine/webrtc_media_engine.h b/media/engine/webrtc_media_engine.h index 53e0893aaf..454d927e4c 100644 --- a/media/engine/webrtc_media_engine.h +++ b/media/engine/webrtc_media_engine.h @@ -49,28 +49,12 @@ struct MediaEngineDependencies { std::unique_ptr video_decoder_factory; }; +// 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. std::unique_ptr CreateMediaEngine( MediaEngineDependencies dependencies); -class WebRtcMediaEngineFactory { - public: - // These Create methods 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. - - // Create a MediaEngineInterface with optional video codec factories. These - // video factories represents all video codecs, i.e. no extra internal video - // codecs will be added. - static std::unique_ptr Create( - rtc::scoped_refptr adm, - rtc::scoped_refptr audio_encoder_factory, - rtc::scoped_refptr audio_decoder_factory, - std::unique_ptr video_encoder_factory, - std::unique_ptr video_decoder_factory, - rtc::scoped_refptr audio_mixer, - rtc::scoped_refptr audio_processing); -}; - // Verify that extension IDs are within 1-byte extension range and are not // overlapping. bool ValidateRtpExtensions(const std::vector& extensions); diff --git a/media/engine/webrtc_media_engine_unittest.cc b/media/engine/webrtc_media_engine_unittest.cc index c39f97d441..525e0d1427 100644 --- a/media/engine/webrtc_media_engine_unittest.cc +++ b/media/engine/webrtc_media_engine_unittest.cc @@ -13,13 +13,7 @@ #include #include -#include "api/audio_codecs/builtin_audio_decoder_factory.h" -#include "api/audio_codecs/builtin_audio_encoder_factory.h" -#include "api/video/builtin_video_bitrate_allocator_factory.h" -#include "api/video_codecs/builtin_video_decoder_factory.h" -#include "api/video_codecs/builtin_video_encoder_factory.h" #include "media/engine/webrtc_media_engine_defaults.h" -#include "modules/audio_processing/include/audio_processing.h" #include "test/field_trial.h" #include "test/gtest.h" @@ -288,17 +282,7 @@ TEST(WebRtcMediaEngineTest, FilterRtpExtensions_RemoveRedundantBwe_3) { EXPECT_EQ(RtpExtension::kTimestampOffsetUri, filtered[0].uri); } -TEST(WebRtcMediaEngineFactoryTest, CreateWithBuiltinDecoders) { - std::unique_ptr engine(WebRtcMediaEngineFactory::Create( - nullptr /* adm */, webrtc::CreateBuiltinAudioEncoderFactory(), - webrtc::CreateBuiltinAudioDecoderFactory(), - webrtc::CreateBuiltinVideoEncoderFactory(), - webrtc::CreateBuiltinVideoDecoderFactory(), nullptr /* audio_mixer */, - webrtc::AudioProcessingBuilder().Create())); - EXPECT_TRUE(engine); -} - -TEST(WebRtcMediaEngineFactoryTest, Create) { +TEST(WebRtcMediaEngineTest, Create) { MediaEngineDependencies deps; webrtc::SetMediaEngineDefaults(&deps);