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

Fix for broken test after r897

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/274001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@898 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2011-11-07 23:24:40 +00:00
parent e2a34f8275
commit 26d3667a26
1 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/modules/audio_coding/main/test/APITest.cpp
View File

@ -1280,7 +1280,6 @@ APITest::TestReceiverVAD(char side)
myReceiveVADActivity = _receiveVADActivityB; myReceiveVADActivity = _receiveVADActivityB;
} }
bool vadStatus = myACM->ReceiveVADStatus();
ACMVADMode mode = myACM->ReceiveVADMode(); ACMVADMode mode = myACM->ReceiveVADMode();
CHECK_ERROR_MT(mode); CHECK_ERROR_MT(mode);
@ -1289,50 +1288,35 @@ APITest::TestReceiverVAD(char side)
{ {
fprintf(stdout, "\n\nCurrent Receive VAD at side %c\n", side); fprintf(stdout, "\n\nCurrent Receive VAD at side %c\n", side);
fprintf(stdout, "----------------------------------\n"); fprintf(stdout, "----------------------------------\n");
fprintf(stdout, "Status........ %s\n", vadStatus? "ON":"OFF");
fprintf(stdout, "mode.......... %d\n", (int)mode); fprintf(stdout, "mode.......... %d\n", (int)mode);
fprintf(stdout, "VAD Active.... %d\n", myReceiveVADActivity[0]); fprintf(stdout, "VAD Active.... %d\n", myReceiveVADActivity[0]);
fprintf(stdout, "VAD Passive... %d\n", myReceiveVADActivity[1]); fprintf(stdout, "VAD Passive... %d\n", myReceiveVADActivity[1]);
fprintf(stdout, "VAD Unknown... %d\n", myReceiveVADActivity[2]); fprintf(stdout, "VAD Unknown... %d\n", myReceiveVADActivity[2]);
} }
if(vadStatus) if(!_randomTest)
{ {
if(!_randomTest) fprintf(stdout, "\nChange Receive VAD at side %c\n\n", side);
{
fprintf(stdout, "\nChange Receive VAD at side %c\n\n", side);
}
switch(mode)
{
case VADNormal:
mode = VADAggr;
break;
case VADLowBitrate:
mode = VADVeryAggr;
break;
case VADAggr:
mode = VADLowBitrate;
break;
case VADVeryAggr:
vadStatus = false;
mode = VADNormal;
break;
default:
mode = VADNormal;
}
CHECK_ERROR_MT(myACM->SetReceiveVADMode(mode));
CHECK_ERROR_MT(myACM->SetReceiveVADStatus(vadStatus));
} }
else
switch(mode)
{ {
if(!_randomTest) case VADNormal:
{ mode = VADAggr;
fprintf(stdout, "\nTurn on Receive VAD at side %c\n\n", side); break;
} case VADLowBitrate:
CHECK_ERROR_MT(myACM->SetReceiveVADStatus(true)); mode = VADVeryAggr;
CHECK_ERROR_MT(myACM->SetReceiveVADMode(VADNormal)); break;
case VADAggr:
mode = VADLowBitrate;
break;
case VADVeryAggr:
mode = VADNormal;
break;
default:
mode = VADNormal;
CHECK_ERROR_MT(myACM->SetReceiveVADMode(mode));
} }
for(int n = 0; n < 3; n++) for(int n = 0; n < 3; n++)
{ {