generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove ACM1/ACM2 switching from VoiceEngine tests

Browse Source 
The option to run VoiceEngine tests with both ACM1 and ACM2 was
introduced while the two versions of AudioCoding module where both
in use. Now, ACM1 is being deprecated, and the tests should use the
defualt one (ACM2).

BUG=2996
R=henrika@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12309004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5964 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org 2014-04-23 08:39:41 +00:00
parent db144429b2
commit 26e2b687fc
4 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc
View File

@ -10,19 +10,10 @@
#include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h"
#include "gflags/gflags.h"
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
#include "webrtc/system_wrappers/interface/sleep.h"
DECLARE_bool(use_acm_version_2);
BeforeInitializationFixture::BeforeInitializationFixture() {
// TODO(minyue): Remove when the old ACM is removed (latest 2014-04-01).
config_.Set<webrtc::AudioCodingModuleFactory>(FLAGS_use_acm_version_2 ?
new webrtc::NewAudioCodingModuleFactory() :
new webrtc::AudioCodingModuleFactory());
voice_engine_ = webrtc::VoiceEngine::Create(config_);
BeforeInitializationFixture::BeforeInitializationFixture()
: voice_engine_(webrtc::VoiceEngine::Create()) {
EXPECT_TRUE(voice_engine_ != NULL);
voe_base_ = webrtc::VoEBase::GetInterface(voice_engine_);

11
webrtc/voice_engine/test/auto_test/voe_standard_test.cc
View File

@ -10,11 +10,11 @@
#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/voice_engine/include/voe_neteq_stats.h"
#include "webrtc/voice_engine/test/auto_test/automated_mode.h"
@ -29,8 +29,6 @@ DEFINE_bool(include_timing_dependent_tests, true,
DEFINE_bool(automated, false,
"If true, we'll run the automated tests we have in noninteractive "
"mode.");
DEFINE_bool(use_acm_version_2, false,
"If true, we'll run the tests with Audio Coding Module version 2.");
using namespace webrtc;
@ -127,12 +125,7 @@ bool VoETestManager::Init() {
return false;
}
// TODO(minyue): Remove when the old ACM is removed (latest 2014-04-01).
config_.Set<AudioCodingModuleFactory>(FLAGS_use_acm_version_2 ?
new NewAudioCodingModuleFactory() :
new AudioCodingModuleFactory());
voice_engine_ = VoiceEngine::Create(config_);
voice_engine_ = VoiceEngine::Create();
if (!voice_engine_) {
TEST_LOG("Failed to create VoiceEngine\n");
return false;

3
webrtc/voice_engine/test/auto_test/voe_standard_test.h
View File

@ -15,7 +15,6 @@
#include <string>
#include "gflags/gflags.h"
#include "webrtc/common.h"
#include "webrtc/voice_engine/include/voe_audio_processing.h"
#include "webrtc/voice_engine/include/voe_base.h"
#include "webrtc/voice_engine/include/voe_dtmf.h"
@ -201,8 +200,6 @@ class VoETestManager {
VoEAudioProcessing* voe_apm_;
ResourceManager resource_manager_;
Config config_;
};
} // namespace voetest

13
webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
View File

@ -19,10 +19,7 @@
#include "gflags/gflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/common.h"
#include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h"
@ -42,8 +39,6 @@
#include "webrtc/voice_engine/include/voe_video_sync.h"
#include "webrtc/voice_engine/include/voe_volume_control.h"
DEFINE_bool(use_acm_version_1, false,
"If true, we'll run the tests with Audio Coding Module version 2.");
DEFINE_bool(use_log_file, false,
"Output logs to a file; by default they will be printed to stderr.");
@ -129,13 +124,7 @@ int main(int argc, char** argv) {
printf("Test started \n");
// TODO(minyue): Remove when the old ACM is removed.
Config config;
config.Set<AudioCodingModuleFactory>(FLAGS_use_acm_version_1 ?
new AudioCodingModuleFactory() :
new NewAudioCodingModuleFactory());
m_voe = VoiceEngine::Create(config);
m_voe = VoiceEngine::Create();
base1 = VoEBase::GetInterface(m_voe);
codec = VoECodec::GetInterface(m_voe);
apm = VoEAudioProcessing::GetInterface(m_voe);