From 26d3667a2687d3231db8cfad78c8c07d39a23aa2 Mon Sep 17 00:00:00 2001
From: "henrike@webrtc.org"
 <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Mon, 7 Nov 2011 23:24:40 +0000
Subject: [PATCH] Fix for broken test after r897 Review URL:
 http://webrtc-codereview.appspot.com/274001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@898 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../audio_coding/main/test/APITest.cpp        | 56 +++++++------------
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/src/modules/audio_coding/main/test/APITest.cpp b/src/modules/audio_coding/main/test/APITest.cpp
index dde0732479..aabd68e36e 100644
--- a/src/modules/audio_coding/main/test/APITest.cpp
+++ b/src/modules/audio_coding/main/test/APITest.cpp
@@ -1280,7 +1280,6 @@ APITest::TestReceiverVAD(char side)
         myReceiveVADActivity = _receiveVADActivityB;
     }
 
-    bool vadStatus = myACM->ReceiveVADStatus();
     ACMVADMode mode = myACM->ReceiveVADMode();
 
     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");
-        fprintf(stdout, "Status........ %s\n", vadStatus? "ON":"OFF");
         fprintf(stdout, "mode.......... %d\n", (int)mode);
         fprintf(stdout, "VAD Active.... %d\n", myReceiveVADActivity[0]);
         fprintf(stdout, "VAD Passive... %d\n", myReceiveVADActivity[1]);
         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);
-        }
-
-        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));
+        fprintf(stdout, "\nChange Receive VAD at side %c\n\n", side);
     }
-    else
+
+    switch(mode)
     {
-        if(!_randomTest)
-        {
-            fprintf(stdout, "\nTurn on Receive VAD at side %c\n\n", side);
-        }
-        CHECK_ERROR_MT(myACM->SetReceiveVADStatus(true));
-        CHECK_ERROR_MT(myACM->SetReceiveVADMode(VADNormal));
+      case VADNormal:
+          mode = VADAggr;
+          break;
+      case VADLowBitrate:
+          mode = VADVeryAggr;
+          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++)
     {