diff --git a/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc b/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc index 4e060ec0eb..4745e4216e 100644 --- a/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc +++ b/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc @@ -184,11 +184,9 @@ NetEqNetworkStatistics RunTest(int loss_cadence, std::string* checksum) { // No callback objects. NetEqTest::Callbacks callbacks; - NetEqTest::ExtDecoderMap external_decoders; NetEqTest neteq_test( config, new rtc::RefCountedObject(&dec), - decoders, external_decoders, nullptr, std::move(lossy_input), - std::move(output), callbacks); + decoders, nullptr, std::move(lossy_input), std::move(output), callbacks); EXPECT_LE(kRunTimeMs, neteq_test.Run()); auto lifetime_stats = neteq_test.LifetimeStats(); diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc index 5dd77e5af4..d45877a192 100644 --- a/modules/audio_coding/neteq/neteq_unittest.cc +++ b/modules/audio_coding/neteq/neteq_unittest.cc @@ -1712,7 +1712,6 @@ TEST(NetEqNoTimeStretchingMode, RunTest) { NetEq::Config config; config.for_test_no_time_stretching = true; auto codecs = NetEqTest::StandardDecoderMap(); - NetEqTest::ExtDecoderMap ext_codecs; NetEqPacketSourceInput::RtpHeaderExtensionMap rtp_ext_map = { {1, kRtpExtensionAudioLevel}, {3, kRtpExtensionAbsoluteSendTime}, @@ -1726,9 +1725,8 @@ TEST(NetEqNoTimeStretchingMode, RunTest) { new TimeLimitedNetEqInput(std::move(input), 20000)); std::unique_ptr output(new VoidAudioSink); NetEqTest::Callbacks callbacks; - NetEqTest test(config, CreateBuiltinAudioDecoderFactory(), codecs, ext_codecs, - nullptr, std::move(input_time_limit), std::move(output), - callbacks); + NetEqTest test(config, CreateBuiltinAudioDecoderFactory(), codecs, nullptr, + std::move(input_time_limit), std::move(output), callbacks); test.Run(); const auto stats = test.SimulationStats(); EXPECT_EQ(0, stats.accelerate_rate); diff --git a/modules/audio_coding/neteq/tools/neteq_test.cc b/modules/audio_coding/neteq/tools/neteq_test.cc index 90d49793fd..46de799176 100644 --- a/modules/audio_coding/neteq/tools/neteq_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_test.cc @@ -53,7 +53,6 @@ void DefaultNetEqTestErrorCallback::OnGetAudioError() { NetEqTest::NetEqTest(const NetEq::Config& config, rtc::scoped_refptr decoder_factory, const DecoderMap& codecs, - const ExtDecoderMap& ext_codecs, std::unique_ptr text_log, std::unique_ptr input, std::unique_ptr output, @@ -67,7 +66,6 @@ NetEqTest::NetEqTest(const NetEq::Config& config, RTC_CHECK(!config.enable_muted_state) << "The code does not handle enable_muted_state"; RegisterDecoders(codecs); - RegisterExternalDecoders(ext_codecs); } NetEqTest::~NetEqTest() = default; @@ -322,16 +320,5 @@ void NetEqTest::RegisterDecoders(const DecoderMap& codecs) { } } -void NetEqTest::RegisterExternalDecoders(const ExtDecoderMap& codecs) { - for (const auto& c : codecs) { - RTC_CHECK_EQ( - neteq_->RegisterExternalDecoder(c.second.decoder, c.second.codec, - c.second.codec_name, c.first), - NetEq::kOK) - << "Cannot register " << c.second.codec_name << " to payload type " - << c.first; - } -} - } // namespace test } // namespace webrtc diff --git a/modules/audio_coding/neteq/tools/neteq_test.h b/modules/audio_coding/neteq/tools/neteq_test.h index 3ccb6fe3b4..5f6c783ca6 100644 --- a/modules/audio_coding/neteq/tools/neteq_test.h +++ b/modules/audio_coding/neteq/tools/neteq_test.h @@ -69,14 +69,6 @@ class NetEqTest : public NetEqSimulator { public: using DecoderMap = std::map >; - struct ExternalDecoderInfo { - AudioDecoder* decoder; - NetEqDecoder codec; - std::string codec_name; - }; - - using ExtDecoderMap = std::map; - struct Callbacks { NetEqTestErrorCallback* error_callback = nullptr; NetEqPostInsertPacket* post_insert_packet = nullptr; @@ -89,7 +81,6 @@ class NetEqTest : public NetEqSimulator { NetEqTest(const NetEq::Config& config, rtc::scoped_refptr decoder_factory, const DecoderMap& codecs, - const ExtDecoderMap& ext_codecs, std::unique_ptr text_log, std::unique_ptr input, std::unique_ptr output, @@ -115,7 +106,6 @@ class NetEqTest : public NetEqSimulator { private: void RegisterDecoders(const DecoderMap& codecs); - void RegisterExternalDecoders(const ExtDecoderMap& codecs); absl::optional next_action_; absl::optional last_packet_time_ms_; std::unique_ptr neteq_; diff --git a/modules/audio_coding/neteq/tools/neteq_test_factory.cc b/modules/audio_coding/neteq/tools/neteq_test_factory.cc index 94e9bb1f12..c391d1d4bc 100644 --- a/modules/audio_coding/neteq/tools/neteq_test_factory.cc +++ b/modules/audio_coding/neteq/tools/neteq_test_factory.cc @@ -500,10 +500,9 @@ std::unique_ptr NetEqTestFactory::InitializeTest( config.sample_rate_hz = *sample_rate_hz; config.max_packets_in_buffer = FLAG_max_nr_packets_in_buffer; config.enable_fast_accelerate = FLAG_enable_fast_accelerate; - NetEqTest::ExtDecoderMap ext_codecs; - return absl::make_unique( - config, decoder_factory, codecs, ext_codecs, std::move(text_log), - std::move(input), std::move(output), callbacks); + return absl::make_unique(config, decoder_factory, codecs, + std::move(text_log), std::move(input), + std::move(output), callbacks); } } // namespace test diff --git a/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/event_log_visualizer/analyzer.cc index ba4fbd1dc8..6582463fbb 100644 --- a/rtc_tools/event_log_visualizer/analyzer.cc +++ b/rtc_tools/event_log_visualizer/analyzer.cc @@ -1747,8 +1747,7 @@ std::unique_ptr CreateNetEqTestAndRun( callbacks.post_insert_packet = neteq_stats_getter->delay_analyzer(); callbacks.get_audio_callback = neteq_stats_getter.get(); - test::NetEqTest::ExtDecoderMap ext_codecs; - test::NetEqTest test(config, decoder_factory, codecs, ext_codecs, nullptr, + test::NetEqTest test(config, decoder_factory, codecs, nullptr, std::move(input), std::move(output), callbacks); test.Run(); return neteq_stats_getter; diff --git a/test/fuzzers/neteq_rtp_fuzzer.cc b/test/fuzzers/neteq_rtp_fuzzer.cc index c4e6dcf757..9399e02094 100644 --- a/test/fuzzers/neteq_rtp_fuzzer.cc +++ b/test/fuzzers/neteq_rtp_fuzzer.cc @@ -137,10 +137,8 @@ void FuzzOneInputTest(const uint8_t* data, size_t size) { RTC_CHECK_EQ(codecs.count(kPayloadType), 1); RTC_CHECK(codecs[kPayloadType].first == NetEqDecoder::kDecoderPCM16Bswb32kHz); - NetEqTest::ExtDecoderMap ext_codecs; - - NetEqTest test(config, CreateBuiltinAudioDecoderFactory(), codecs, ext_codecs, - nullptr, std::move(input), std::move(output), callbacks); + NetEqTest test(config, CreateBuiltinAudioDecoderFactory(), codecs, nullptr, + std::move(input), std::move(output), callbacks); test.Run(); } diff --git a/test/fuzzers/neteq_signal_fuzzer.cc b/test/fuzzers/neteq_signal_fuzzer.cc index 96ba95d96a..e253a529f9 100644 --- a/test/fuzzers/neteq_signal_fuzzer.cc +++ b/test/fuzzers/neteq_signal_fuzzer.cc @@ -182,10 +182,8 @@ void FuzzOneInputTest(const uint8_t* data, size_t size) { RTC_CHECK(codecs[rate_types[3].second].first == NetEqDecoder::kDecoderPCM16Bswb48kHz); - NetEqTest::ExtDecoderMap ext_codecs; - - NetEqTest test(config, CreateBuiltinAudioDecoderFactory(), codecs, ext_codecs, - nullptr, std::move(input), std::move(output), callbacks); + NetEqTest test(config, CreateBuiltinAudioDecoderFactory(), codecs, nullptr, + std::move(input), std::move(output), callbacks); test.Run(); }