1 files changed, 7 insertions, 15 deletions
diff --git a/test/call_test.cc b/test/call_test.cc
index 4e7fa9ac..126c7163 100644
--- a/test/call_test.cc
+++ b/test/call_test.cc
@@ -99,23 +99,15 @@ void CallTest::CreateSendConfig(size_t num_streams) {
 void CallTest::CreateMatchingReceiveConfigs() {
   assert(!send_config_.rtp.ssrcs.empty());
   assert(receive_configs_.empty());
-  assert(fake_decoders_.empty());
+  assert(allocated_decoders_.empty());
   VideoReceiveStream::Config config;
-  VideoCodec codec =
-      test::CreateDecoderVideoCodec(send_config_.encoder_settings);
-  config.codecs.push_back(codec);
   config.rtp.local_ssrc = kReceiverLocalSsrc;
-  if (send_config_.encoder_settings.encoder == &fake_encoder_) {
-    config.external_decoders.resize(1);
-    config.external_decoders[0].payload_type =
-        send_config_.encoder_settings.payload_type;
-  }
   for (size_t i = 0; i < send_config_.rtp.ssrcs.size(); ++i) {
-    if (send_config_.encoder_settings.encoder == &fake_encoder_) {
-      FakeDecoder* decoder = new FakeDecoder();
-      fake_decoders_.push_back(decoder);
-      config.external_decoders[0].decoder = decoder;
-    }
+    VideoReceiveStream::Decoder decoder =
+        test::CreateMatchingDecoder(send_config_.encoder_settings);
+    allocated_decoders_.push_back(decoder.decoder);
+    config.decoders.clear();
+    config.decoders.push_back(decoder);
     config.rtp.remote_ssrc = send_config_.rtp.ssrcs[i];
     receive_configs_.push_back(config);
   }
@@ -150,7 +142,7 @@ void CallTest::DestroyStreams() {
   for (size_t i = 0; i < receive_streams_.size(); ++i)
     receiver_call_->DestroyVideoReceiveStream(receive_streams_[i]);
   receive_streams_.clear();
-  fake_decoders_.clear();
+  allocated_decoders_.clear();
 }
 
 const unsigned int CallTest::kDefaultTimeoutMs = 30 * 1000;