diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/libwebrtc/media/engine/webrtc_media_engine.cc | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | third_party/libwebrtc/media/engine/webrtc_media_engine.cc | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/third_party/libwebrtc/media/engine/webrtc_media_engine.cc b/third_party/libwebrtc/media/engine/webrtc_media_engine.cc index 463ed29109..31769e05de 100644 --- a/third_party/libwebrtc/media/engine/webrtc_media_engine.cc +++ b/third_party/libwebrtc/media/engine/webrtc_media_engine.cc @@ -12,53 +12,16 @@ #include <algorithm> #include <map> -#include <memory> #include <string> #include <utility> #include "absl/algorithm/container.h" #include "absl/strings/match.h" -#include "api/transport/field_trial_based_config.h" #include "media/base/media_constants.h" -#include "media/engine/webrtc_voice_engine.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#ifdef HAVE_WEBRTC_VIDEO -#include "media/engine/webrtc_video_engine.h" -#else -#include "media/engine/null_webrtc_video_engine.h" -#endif - namespace cricket { - -std::unique_ptr<MediaEngineInterface> CreateMediaEngine( - MediaEngineDependencies dependencies) { - // TODO(sprang): Make populating `dependencies.trials` mandatory and remove - // these fallbacks. - std::unique_ptr<webrtc::FieldTrialsView> fallback_trials( - dependencies.trials ? nullptr : new webrtc::FieldTrialBasedConfig()); - const webrtc::FieldTrialsView& trials = - dependencies.trials ? *dependencies.trials : *fallback_trials; - auto audio_engine = std::make_unique<WebRtcVoiceEngine>( - dependencies.task_queue_factory, dependencies.adm.get(), - std::move(dependencies.audio_encoder_factory), - std::move(dependencies.audio_decoder_factory), - std::move(dependencies.audio_mixer), - std::move(dependencies.audio_processing), - std::move(dependencies.owned_audio_frame_processor), trials); -#ifdef HAVE_WEBRTC_VIDEO - auto video_engine = std::make_unique<WebRtcVideoEngine>( - std::move(dependencies.video_encoder_factory), - std::move(dependencies.video_decoder_factory), trials); -#else - auto video_engine = std::make_unique<NullWebRtcVideoEngine>(); -#endif - return std::make_unique<CompositeMediaEngine>(std::move(fallback_trials), - std::move(audio_engine), - std::move(video_engine)); -} - namespace { // Remove mutually exclusive extensions with lower priority. void DiscardRedundantExtensions( |