diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/modules/audio_coding/neteq/tools/neteq_quality_test.cc index 273fec2475..530426bec6 100644 --- a/modules/audio_coding/neteq/tools/neteq_quality_test.cc +++ b/modules/audio_coding/neteq/tools/neteq_quality_test.cc @@ -11,7 +11,6 @@ #include #include -#include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "modules/audio_coding/neteq/tools/neteq_quality_test.h" #include "modules/audio_coding/neteq/tools/output_audio_file.h" #include "modules/audio_coding/neteq/tools/output_wav_file.h" @@ -132,10 +131,12 @@ static double ProbTrans00Solver(int units, return x; } -NetEqQualityTest::NetEqQualityTest(int block_duration_ms, - int in_sampling_khz, - int out_sampling_khz, - const SdpAudioFormat& format) +NetEqQualityTest::NetEqQualityTest( + int block_duration_ms, + int in_sampling_khz, + int out_sampling_khz, + const SdpAudioFormat& format, + const rtc::scoped_refptr& decoder_factory) : audio_format_(format), channels_(static_cast(FLAG_channels)), decoded_time_ms_(0), @@ -206,8 +207,7 @@ NetEqQualityTest::NetEqQualityTest(int block_duration_ms, NetEq::Config config; config.sample_rate_hz = out_sampling_khz_ * 1000; - neteq_.reset( - NetEq::Create(config, webrtc::CreateBuiltinAudioDecoderFactory())); + neteq_.reset(NetEq::Create(config, decoder_factory)); max_payload_bytes_ = in_size_samples_ * channels_ * sizeof(int16_t); in_data_.reset(new int16_t[in_size_samples_ * channels_]); } diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.h b/modules/audio_coding/neteq/tools/neteq_quality_test.h index 82a6a64d00..e9c6dab0f4 100644 --- a/modules/audio_coding/neteq/tools/neteq_quality_test.h +++ b/modules/audio_coding/neteq/tools/neteq_quality_test.h @@ -14,6 +14,7 @@ #include #include +#include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "modules/audio_coding/neteq/include/neteq.h" #include "modules/audio_coding/neteq/tools/audio_sink.h" #include "modules/audio_coding/neteq/tools/input_audio_file.h" @@ -95,10 +96,13 @@ class FixedLossModel : public LossModel { class NetEqQualityTest : public ::testing::Test { protected: - NetEqQualityTest(int block_duration_ms, - int in_sampling_khz, - int out_sampling_khz, - const SdpAudioFormat& format); + NetEqQualityTest( + int block_duration_ms, + int in_sampling_khz, + int out_sampling_khz, + const SdpAudioFormat& format, + const rtc::scoped_refptr& decoder_factory = + webrtc::CreateBuiltinAudioDecoderFactory()); ~NetEqQualityTest() override; void SetUp() override;