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
This commit is contained in:
minyue@webrtc.org 2014-08-06 10:05:19 +00:00
parent 79c3359e67
commit 2a8df7c375
2 changed files with 2 additions and 3 deletions

View File

@ -4200,9 +4200,9 @@ int32_t
Channel::MixAudioWithFile(AudioFrame& audioFrame,
int mixingFrequency)
{
assert(mixingFrequency <= 32000);
assert(mixingFrequency <= 48000);
scoped_ptr<int16_t[]> fileBuffer(new int16_t[640]);
scoped_ptr<int16_t[]> fileBuffer(new int16_t[960]);
int fileSamples(0);
{

View File

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