From 15192f909e5a7e43287d2ec6cbb567c59afba7ce Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Thu, 10 Apr 2014 06:34:32 +0000 Subject: [PATCH] (Auto)update libjingle 64594651-> 64630087 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5878 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/commit_message.txt | 8 ++++++++ talk/media/webrtc/webrtcvoiceengine.cc | 4 ++-- talk/media/webrtc/webrtcvoiceengine_unittest.cc | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100755 talk/commit_message.txt diff --git a/talk/commit_message.txt b/talk/commit_message.txt new file mode 100755 index 0000000000..117720043f --- /dev/null +++ b/talk/commit_message.txt @@ -0,0 +1,8 @@ +Change 64504440 updated. +Starting METADATA Presubmit checks ... +Spawned CheckCopyright (//depot/METADATA) +Success: CheckCopyright (5.25 us) +Presubmit checks finished with: + 0 errors; 0 warnings; 0 notices. +Change 64504440 updated. +Reverting any unchanged files. diff --git a/talk/media/webrtc/webrtcvoiceengine.cc b/talk/media/webrtc/webrtcvoiceengine.cc index bf4cef6e01..387dd9a4ea 100644 --- a/talk/media/webrtc/webrtcvoiceengine.cc +++ b/talk/media/webrtc/webrtcvoiceengine.cc @@ -409,9 +409,9 @@ void WebRtcVoiceEngine::Construct() { #endif options_ = GetDefaultEngineOptions(); - // Initialize the VoE Configuration to the default ACM. + // Initialize the VoE Configuration to the new ACM. voe_config_.Set( - new webrtc::AudioCodingModuleFactory); + new webrtc::NewAudioCodingModuleFactory); } static bool IsOpus(const AudioCodec& codec) { diff --git a/talk/media/webrtc/webrtcvoiceengine_unittest.cc b/talk/media/webrtc/webrtcvoiceengine_unittest.cc index 4dbeebaaa9..f29c200d19 100644 --- a/talk/media/webrtc/webrtcvoiceengine_unittest.cc +++ b/talk/media/webrtc/webrtcvoiceengine_unittest.cc @@ -3089,14 +3089,14 @@ TEST(WebRtcVoiceEngineTest, CoInitialize) { TEST_F(WebRtcVoiceEngineTestFake, SetExperimentalAcm) { EXPECT_TRUE(SetupEngine()); - // By default experimental ACM should not be used. + // By default the new ACM should be used. int media_channel = engine_.CreateMediaVoiceChannel(); ASSERT_GE(media_channel, 0); - EXPECT_FALSE(voe_.IsUsingExperimentalAcm(media_channel)); + EXPECT_TRUE(voe_.IsUsingExperimentalAcm(media_channel)); int soundclip_channel = engine_.CreateSoundclipVoiceChannel(); ASSERT_GE(soundclip_channel, 0); - EXPECT_FALSE(voe_sc_.IsUsingExperimentalAcm(soundclip_channel)); + EXPECT_TRUE(voe_sc_.IsUsingExperimentalAcm(soundclip_channel)); // Set options to use experimental ACM. cricket::AudioOptions options;