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

Turn webrtc::Vad into a pure virtual interface

Browse Source 
Review URL: https://codereview.webrtc.org/1317243005

Cr-Commit-Position: refs/heads/master@{#9899}
This commit is contained in:
kwiberg
2015-09-08 23:04:51 -07:00
committed by Commit bot
parent 233bd87d45
commit e9e7896293
5 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
View File

@ -54,7 +54,8 @@ AudioEncoderCng::AudioEncoderCng(const Config& config)
num_cng_coefficients_(config.num_cng_coefficients),
sid_frame_interval_ms_(config.sid_frame_interval_ms),
last_frame_active_(true),
vad_(config.vad ? config.vad : new Vad(config.vad_mode)) {
vad_(config.vad ? rtc_make_scoped_ptr(config.vad)
: CreateVad(config.vad_mode)) {
CHECK(config.IsOk()) << "Invalid configuration.";
cng_inst_ = CreateCngInst(SampleRateHz(), sid_frame_interval_ms_,
num_cng_coefficients_);

2
webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
View File

@ -34,7 +34,7 @@ static const int kCngPayloadType = 18;
class AudioEncoderCngTest : public ::testing::Test {
protected:
AudioEncoderCngTest()
: mock_vad_(new MockVad(Vad::kVadNormal)),
: mock_vad_(new MockVad),
timestamp_(4711),
num_audio_samples_10ms_(0),
sample_rate_hz_(8000) {