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

(Auto)update libjingle 64594651-> 64630087

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5878 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-04-10 06:34:32 +00:00
parent f93021430d
commit 15192f909e
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
talk/commit_message.txt Executable file
View File

@ -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.

4
talk/media/webrtc/webrtcvoiceengine.cc
View File

@ -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<webrtc::AudioCodingModuleFactory>(
new webrtc::AudioCodingModuleFactory);
new webrtc::NewAudioCodingModuleFactory);
}
static bool IsOpus(const AudioCodec& codec) {

6
talk/media/webrtc/webrtcvoiceengine_unittest.cc
View File

@ -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;