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

VAD/DTX tests: Don't let the ACM create audio encoders

Browse Source 
It will soon lose the ability to do so.

Bug: webrtc:8396
Change-Id: I06dce417bba855b57130bd1a052988b2f235dcbd
Reviewed-on: https://webrtc-review.googlesource.com/102882
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24921}
This commit is contained in:
Karl Wiberg
2018-10-01 17:26:11 +02:00
committed by Commit Bot
parent 8abd56cfdf
commit 895ce82cab
4 changed files with 79 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/audio_coding/test/TestVADDTX.h
View File

@ -13,6 +13,9 @@
#include <memory>
#include "api/audio_codecs/audio_decoder_factory.h"
#include "api/audio_codecs/audio_encoder_factory.h"
#include "common_audio/vad/include/vad.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/include/audio_coding_module.h"
#include "modules/audio_coding/include/audio_coding_module_typedefs.h"
@ -48,7 +51,9 @@ class TestVadDtx {
TestVadDtx();
protected:
void RegisterCodec(CodecInst codec_param);
// Returns true iff CN was added.
bool RegisterCodec(const SdpAudioFormat& codec_format,
absl::optional<Vad::Aggressiveness> vad_mode);
// Encoding a file and see if the numbers that various packets occur follow
// the expectation. Saves result to a file.
@ -69,6 +74,8 @@ class TestVadDtx {
bool append,
const int* expects);
const rtc::scoped_refptr<AudioEncoderFactory> encoder_factory_;
const rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
std::unique_ptr<AudioCodingModule> acm_send_;
std::unique_ptr<AudioCodingModule> acm_receive_;
std::unique_ptr<Channel> channel_;
@ -84,12 +91,9 @@ class TestWebRtcVadDtx final : public TestVadDtx {
void Perform();
private:
void RunTestCases();
void Test(bool new_outfile);
void SetVAD(bool enable_dtx, bool enable_vad, ACMVADMode vad_mode);
void RunTestCases(const SdpAudioFormat& codec_format);
void Test(bool new_outfile, bool expect_dtx_enabled);
bool vad_enabled_;
bool dtx_enabled_;
int output_file_num_;
};