From 05e5c32f98b0917520dcd4e7ca47a39f5e43d671 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Fri, 1 Nov 2024 12:40:37 +0100 Subject: [PATCH] Replace usage of AudioProcessingBuilder in EnableMediaWithDefaults Bug: webrtc:369904700 Change-Id: Ia4962ac751d62e1dbaad165cec35216db0710ce9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/367280 Commit-Queue: Danil Chapovalov Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#43372} --- api/BUILD.gn | 7 +------ api/enable_media_with_defaults.cc | 9 +++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/api/BUILD.gn b/api/BUILD.gn index f9aad9108f..35c5926ab9 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -62,17 +62,12 @@ rtc_source_set("enable_media_with_defaults") { ":libjingle_peerconnection_api", ":scoped_refptr", "../rtc_base/system:rtc_export", - "audio:audio_processing", - "audio_codecs:audio_codecs_api", - "audio_codecs:audio_codecs_api", + "audio:builtin_audio_processing_builder", "audio_codecs:builtin_audio_decoder_factory", "audio_codecs:builtin_audio_encoder_factory", "task_queue:default_task_queue_factory", - "task_queue:task_queue", "video_codecs:builtin_video_decoder_factory", "video_codecs:builtin_video_encoder_factory", - "video_codecs:video_codecs_api", - "video_codecs:video_codecs_api", ] } diff --git a/api/enable_media_with_defaults.cc b/api/enable_media_with_defaults.cc index a2e85c60fd..c8cc239c9b 100644 --- a/api/enable_media_with_defaults.cc +++ b/api/enable_media_with_defaults.cc @@ -12,7 +12,7 @@ #include -#include "api/audio/audio_processing.h" +#include "api/audio/builtin_audio_processing_builder.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/enable_media.h" @@ -36,12 +36,9 @@ void EnableMediaWithDefaults(PeerConnectionFactoryDependencies& deps) { } if (deps.audio_processing == nullptr && deps.audio_processing_builder == nullptr) { - // TODO: bugs.webrtc.org/369904700 - set `deps.audio_processing_builder` - // instead of `deps.audio_processing` when there is an implementation that - // can replace `AudioProcessingBuilder`. - deps.audio_processing = AudioProcessingBuilder().Create(); + deps.audio_processing_builder = + std::make_unique(); } - if (deps.video_encoder_factory == nullptr) { deps.video_encoder_factory = CreateBuiltinVideoEncoderFactory(); }