From 2a8df7c375c73a3f477ee5cd9d85336a98f57ee2 Mon Sep 17 00:00:00 2001 From: "minyue@webrtc.org" Date: Wed, 6 Aug 2014 10:05:19 +0000 Subject: [PATCH] Fixing two bugs in voe_cmd_test. I am trying to add a new functionality to voe_cmd_test, and I found two bugs: 1. in r5928, a functionality was removed but the item in the menu was not. Functionalities after it are offset. r5928: https://code.google.com/p/webrtc/source/detail?r=5928&path=/trunk/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc 2. in r6736, opus are set to output 48 kHz audio. When mixing Opus output with an audio file, channel.cc may go wrong. r6736: https://code.google.com/p/webrtc/source/detail?r=6736 BUG= R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/15099004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6836 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/voice_engine/channel.cc | 4 ++-- webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index e811a273de..c9364efb12 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -4200,9 +4200,9 @@ int32_t Channel::MixAudioWithFile(AudioFrame& audioFrame, int mixingFrequency) { - assert(mixingFrequency <= 32000); + assert(mixingFrequency <= 48000); - scoped_ptr fileBuffer(new int16_t[640]); + scoped_ptr fileBuffer(new int16_t[960]); int fileSamples(0); { diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc index d213af6267..a30764ad96 100644 --- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc +++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc @@ -433,7 +433,6 @@ void RunTest(std::string out_path) { printf("%i. Toggle receive-side NS \n", option_index++); printf("%i. AGC status \n", option_index++); printf("%i. Toggle microphone mute \n", option_index++); - printf("%i. Toggle on hold status \n", option_index++); printf("%i. Get last error code \n", option_index++); printf("%i. Toggle typing detection \n", option_index++);