From 2c74bab8b9266e657e99db688eb92de08269708d Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Mon, 31 Oct 2011 19:54:20 +0000
Subject: [PATCH] Remove unneeded assert and tracing.

This is related to r840.

BUG=
TEST=voe_auto_test

Review URL: http://webrtc-codereview.appspot.com/239019

git-svn-id: http://webrtc.googlecode.com/svn/trunk@845 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 src/voice_engine/main/source/channel.cc | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/voice_engine/main/source/channel.cc b/src/voice_engine/main/source/channel.cc
index 155fa57c6..5468aed0b 100644
--- a/src/voice_engine/main/source/channel.cc
+++ b/src/voice_engine/main/source/channel.cc
@@ -824,15 +824,6 @@ WebRtc_Word32 Channel::GetAudioFrame(const WebRtc_Word32 id,
     WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,_channelId),
                  "Channel::GetAudioFrame(id=%d)", id);
 
-    // TODO(zakkhoyt): temporary logs for tracking down an issue. Remove when
-    // Checking to ensure receive VAD is enabled
-    if (!_audioCodingModule.ReceiveVADStatus())
-    {  
-        WEBRTC_TRACE(kTraceWarning, kTraceVoice,
-                     VoEId(_instanceId,_channelId),
-                     "VAD is currently disabled");
-    }
-
     // Get 10ms raw PCM data from the ACM (mixer limits output frequency)
     if (_audioCodingModule.PlayoutData10Ms(
         audioFrame._frequencyInHz, (AudioFrame&)audioFrame) == -1)
@@ -841,10 +832,6 @@ WebRtc_Word32 Channel::GetAudioFrame(const WebRtc_Word32 id,
                      VoEId(_instanceId,_channelId),
                      "Channel::GetAudioFrame() PlayoutData10Ms() failed!");
     }
-    
-    // TODO(zakkhoyt): temporary logs for tracking down an issue. Remove when
-    // possible.
-    assert(audioFrame._vadActivity != AudioFrame::kVadUnknown);
 
     if (_RxVadDetection)
     {
@@ -1422,18 +1409,6 @@ Channel::Init()
         return -1;
     }
 
-    // TODO(zakkhoyt): temporary logs for tracking down an issue. Remove when
-    // possible.
-    // enable RX VAD by default (improves output mixing)
-    if (_audioCodingModule.SetReceiveVADStatus(true) == -1)
-    {
-        _engineStatisticsPtr->SetLastError(
-            VE_AUDIO_CODING_MODULE_ERROR, kTraceError,
-            "Channel::Init() unable to initialize the ACM - 1. "
-            "ACM failed to SetReceiveVADStatus");
-        return -1;
-    }
-
     // --- RTP/RTCP module initialization
 
     // Ensure that RTCP is enabled by default for the created channel.