From 578905e7ca73b87984672485fb2deb2d23a5268a Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Tue, 18 Jun 2024 13:02:58 +0200 Subject: [PATCH] Provide Environment to create audio encoders in both prod code paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:343086059 Change-Id: I4a3e48dcafe99c47f7c9847c5c3994c9c49807c1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/355002 Commit-Queue: Danil Chapovalov Reviewed-by: Jakob Ivarsson‎ Cr-Commit-Position: refs/heads/main@{#42508} --- audio/audio_send_stream.cc | 7 ++++--- audio/voip/voip_core.cc | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index 1bf66a1fcc..18f28c67eb 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -558,9 +558,10 @@ bool AudioSendStream::SetupSendCodec(const Config& new_config) { const auto& spec = *new_config.send_codec_spec; RTC_DCHECK(new_config.encoder_factory); - std::unique_ptr encoder = - new_config.encoder_factory->MakeAudioEncoder( - spec.payload_type, spec.format, new_config.codec_pair_id); + std::unique_ptr encoder = new_config.encoder_factory->Create( + env_, spec.format, + {.payload_type = spec.payload_type, + .codec_pair_id = new_config.codec_pair_id}); if (!encoder) { RTC_DLOG(LS_ERROR) << "Unable to create encoder for " diff --git a/audio/voip/voip_core.cc b/audio/voip/voip_core.cc index 30c84596a3..c1e1a0686c 100644 --- a/audio/voip/voip_core.cc +++ b/audio/voip/voip_core.cc @@ -380,8 +380,8 @@ VoipResult VoipCore::SetSendCodec(ChannelId channel_id, return VoipResult::kInvalidArgument; } - auto encoder = encoder_factory_->MakeAudioEncoder( - payload_type, encoder_format, absl::nullopt); + auto encoder = encoder_factory_->Create(env_, encoder_format, + {.payload_type = payload_type}); channel->SetEncoder(payload_type, encoder_format, std::move(encoder)); return VoipResult::kOk;