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<AudioEncoder> encoder =
-      new_config.encoder_factory->MakeAudioEncoder(
-          spec.payload_type, spec.format, new_config.codec_pair_id);
+  std::unique_ptr<AudioEncoder> 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;