zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose audio decoder factory in neteq_quality_test

Browse Source 
Bug: webrtc:10690
Change-Id: Ic9073fad82963d4a953a80d1eff043bf9430deff
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139102
Reviewed-by: Minyue Li <minyue@webrtc.org>
Commit-Queue: Pablo Barrera González <barrerap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28132}
This commit is contained in:
Pablo Barrera González
2019-05-29 09:24:29 +02:00
committed by Commit Bot
parent 695cf6ac42
commit 62838fe300
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/audio_coding/neteq/tools/neteq_quality_test.cc
View File

@ -11,7 +11,6 @@
#include <stdio.h> #include <stdio.h>
#include <cmath> #include <cmath>
#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/neteq_quality_test.h"
#include "modules/audio_coding/neteq/tools/output_audio_file.h" #include "modules/audio_coding/neteq/tools/output_audio_file.h"
#include "modules/audio_coding/neteq/tools/output_wav_file.h" #include "modules/audio_coding/neteq/tools/output_wav_file.h"
@ -132,10 +131,12 @@ static double ProbTrans00Solver(int units,
return x; return x;
} }
NetEqQualityTest::NetEqQualityTest(int block_duration_ms, NetEqQualityTest::NetEqQualityTest(
int in_sampling_khz, int block_duration_ms,
int out_sampling_khz, int in_sampling_khz,
const SdpAudioFormat& format) int out_sampling_khz,
const SdpAudioFormat& format,
const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory)
: audio_format_(format), : audio_format_(format),
channels_(static_cast<size_t>(FLAG_channels)), channels_(static_cast<size_t>(FLAG_channels)),
decoded_time_ms_(0), decoded_time_ms_(0),
@ -206,8 +207,7 @@ NetEqQualityTest::NetEqQualityTest(int block_duration_ms,
NetEq::Config config; NetEq::Config config;
config.sample_rate_hz = out_sampling_khz_ * 1000; config.sample_rate_hz = out_sampling_khz_ * 1000;
neteq_.reset( neteq_.reset(NetEq::Create(config, decoder_factory));
NetEq::Create(config, webrtc::CreateBuiltinAudioDecoderFactory()));
max_payload_bytes_ = in_size_samples_ * channels_ * sizeof(int16_t); max_payload_bytes_ = in_size_samples_ * channels_ * sizeof(int16_t);
in_data_.reset(new int16_t[in_size_samples_ * channels_]); in_data_.reset(new int16_t[in_size_samples_ * channels_]);
} }

12
modules/audio_coding/neteq/tools/neteq_quality_test.h
View File

@ -14,6 +14,7 @@
#include <fstream> #include <fstream>
#include <memory> #include <memory>
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "modules/audio_coding/neteq/include/neteq.h" #include "modules/audio_coding/neteq/include/neteq.h"
#include "modules/audio_coding/neteq/tools/audio_sink.h" #include "modules/audio_coding/neteq/tools/audio_sink.h"
#include "modules/audio_coding/neteq/tools/input_audio_file.h" #include "modules/audio_coding/neteq/tools/input_audio_file.h"
@ -95,10 +96,13 @@ class FixedLossModel : public LossModel {
class NetEqQualityTest : public ::testing::Test { class NetEqQualityTest : public ::testing::Test {
protected: protected:
NetEqQualityTest(int block_duration_ms, NetEqQualityTest(
int in_sampling_khz, int block_duration_ms,
int out_sampling_khz, int in_sampling_khz,
const SdpAudioFormat& format); int out_sampling_khz,
const SdpAudioFormat& format,
const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory =
webrtc::CreateBuiltinAudioDecoderFactory());
~NetEqQualityTest() override; ~NetEqQualityTest() override;
void SetUp() override; void SetUp() override;