Reduce LS_INFO spam from voice_engine/.

Removes ShouldIgnoreTrace from WebRtcVoiceEngine and removes the spammy
log instances instead. Also removes trace-style logging from getters
(::GetLocalSSRC() for instance would print what SSRC it got, spamming
the log).

BUG=
R=henrika@webrtc.org

Review URL: https://codereview.webrtc.org/1347353004 .

Cr-Commit-Position: refs/heads/master@{#10028}
diff --git a/talk/media/webrtc/webrtcvoiceengine.cc b/talk/media/webrtc/webrtcvoiceengine.cc
index ff5f6d5..69050c3 100644
--- a/talk/media/webrtc/webrtcvoiceengine.cc
+++ b/talk/media/webrtc/webrtcvoiceengine.cc
@@ -1182,34 +1182,6 @@
   }
 }
 
-// Ignore spammy trace messages, mostly from the stats API when we haven't
-// gotten RTCP info yet from the remote side.
-bool WebRtcVoiceEngine::ShouldIgnoreTrace(const std::string& trace) {
-  static const char* kTracesToIgnore[] = {
-    "\tfailed to GetReportBlockInformation",
-    "GetRecCodec() failed to get received codec",
-    "GetReceivedRtcpStatistics: Could not get received RTP statistics",
-    "GetRemoteRTCPData() failed to measure statistics due to lack of received RTP and/or RTCP packets",  // NOLINT
-    "GetRemoteRTCPData() failed to retrieve sender info for remote side",
-    "GetRTPStatistics() failed to measure RTT since no RTP packets have been received yet",  // NOLINT
-    "GetRTPStatistics() failed to read RTP statistics from the RTP/RTCP module",
-    "GetRTPStatistics() failed to retrieve RTT from the RTP/RTCP module",
-    "SenderInfoReceived No received SR",
-    "StatisticsRTP() no statistics available",
-    "TransmitMixer::TypingDetection() VE_TYPING_NOISE_WARNING message has been posted",  // NOLINT
-    "TransmitMixer::TypingDetection() pending noise-saturation warning exists",  // NOLINT
-    "GetRecPayloadType() failed to retrieve RX payload type (error=10026)", // NOLINT
-    "StopPlayingFileAsMicrophone() isnot playing (error=8088)",
-    NULL
-  };
-  for (const char* const* p = kTracesToIgnore; *p; ++p) {
-    if (trace.find(*p) != std::string::npos) {
-      return true;
-    }
-  }
-  return false;
-}
-
 void WebRtcVoiceEngine::Print(webrtc::TraceLevel level, const char* trace,
                               int length) {
   rtc::LoggingSeverity sev = rtc::LS_VERBOSE;
@@ -1229,9 +1201,7 @@
     LOG_V(sev) << msg;
   } else {
     std::string msg(trace + 71, length - 72);
-    if (!ShouldIgnoreTrace(msg)) {
-      LOG_V(sev) << "webrtc: " << msg;
-    }
+    LOG_V(sev) << "webrtc: " << msg;
   }
 }
 
diff --git a/talk/media/webrtc/webrtcvoiceengine.h b/talk/media/webrtc/webrtcvoiceengine.h
index a1a6b48..19fefce 100644
--- a/talk/media/webrtc/webrtcvoiceengine.h
+++ b/talk/media/webrtc/webrtcvoiceengine.h
@@ -110,9 +110,6 @@
   // Starts AEC dump using existing file.
   bool StartAecDump(rtc::PlatformFile file);
 
-  // Check whether the supplied trace should be ignored.
-  bool ShouldIgnoreTrace(const std::string& trace);
-
   // Create a VoiceEngine Channel.
   int CreateMediaVoiceChannel();
 
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 05d5f8f..4ac4b89 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -205,9 +205,6 @@
 int32_t
 Channel::OnRxVadDetected(int vadDecision)
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
-                 "Channel::OnRxVadDetected(vadDecision=%d)", vadDecision);
-
     CriticalSectionScoped cs(&_callbackCritSect);
     if (_rxVadObserverPtr)
     {
@@ -425,9 +422,6 @@
 
 int32_t Channel::GetAudioFrame(int32_t id, AudioFrame* audioFrame)
 {
-    WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::GetAudioFrame(id=%d)", id);
-
     if (event_log_) {
       unsigned int ssrc;
       RTC_CHECK_EQ(GetLocalSSRC(ssrc), 0);
@@ -1332,8 +1326,6 @@
 int32_t
 Channel::GetVADStatus(bool& enabledVAD, ACMVADMode& mode, bool& disabledDTX)
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::GetVADStatus");
     if (audio_coding_->VAD(&disabledDTX, &enabledVAD, &mode) != 0)
     {
         _engineStatisticsPtr->SetLastError(
@@ -1440,8 +1432,6 @@
 int32_t
 Channel::GetRecPayloadType(CodecInst& codec)
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::GetRecPayloadType()");
     int8_t payloadType(-1);
     if (rtp_payload_registry_->ReceivePayloadType(
         codec.plname,
@@ -1456,8 +1446,6 @@
         return -1;
     }
     codec.pltype = payloadType;
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::GetRecPayloadType() => pltype=%d", codec.pltype);
     return 0;
 }
 
@@ -1869,9 +1857,6 @@
 
     if (!channel_state_.Get().output_file_playing)
     {
-        _engineStatisticsPtr->SetLastError(
-            VE_INVALID_OPERATION, kTraceWarning,
-            "StopPlayingFileLocally() isnot playing");
         return 0;
     }
 
@@ -1907,9 +1892,6 @@
 
 int Channel::IsPlayingFileLocally() const
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::IsPlayingFileLocally()");
-
     return channel_state_.Get().output_file_playing;
 }
 
@@ -2093,9 +2075,6 @@
 
     if (!channel_state_.Get().input_file_playing)
     {
-        _engineStatisticsPtr->SetLastError(
-            VE_INVALID_OPERATION, kTraceWarning,
-            "StopPlayingFileAsMicrophone() isnot playing");
         return 0;
     }
 
@@ -2116,8 +2095,6 @@
 
 int Channel::IsPlayingFileAsMicrophone() const
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::IsPlayingFileAsMicrophone()");
     return channel_state_.Get().input_file_playing;
 }
 
@@ -2319,9 +2296,6 @@
 {
     int8_t currentLevel = _outputAudioLevel.Level();
     level = static_cast<int32_t> (currentLevel);
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-               VoEId(_instanceId,_channelId),
-               "GetSpeechOutputLevel() => level=%u", level);
     return 0;
 }
 
@@ -2330,9 +2304,6 @@
 {
     int16_t currentLevel = _outputAudioLevel.LevelFullRange();
     level = static_cast<int32_t> (currentLevel);
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-               VoEId(_instanceId,_channelId),
-               "GetSpeechOutputLevelFullRange() => level=%u", level);
     return 0;
 }
 
@@ -2370,9 +2341,6 @@
     CriticalSectionScoped cs(&volume_settings_critsect_);
     left = _panLeft;
     right = _panRight;
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-               VoEId(_instanceId,_channelId),
-               "GetOutputVolumePan() => left=%3.2f, right=%3.2f", left, right);
     return 0;
 }
 
@@ -2391,9 +2359,6 @@
 {
     CriticalSectionScoped cs(&volume_settings_critsect_);
     scaling = _outputGain;
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-               VoEId(_instanceId,_channelId),
-               "GetChannelOutputVolumeScaling() => scaling=%3.2f", scaling);
     return 0;
 }
 
@@ -2468,12 +2433,7 @@
 int
 Channel::GetSendTelephoneEventPayloadType(unsigned char& type)
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::GetSendTelephoneEventPayloadType()");
     type = _sendTelephoneEventPayloadType;
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-               VoEId(_instanceId,_channelId),
-               "GetSendTelephoneEventPayloadType() => type=%u", type);
     return 0;
 }
 
@@ -2541,9 +2501,6 @@
 Channel::VoiceActivityIndicator(int &activity)
 {
     activity = _sendFrameType;
-
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::VoiceActivityIndicator(indicator=%d)", activity);
     return 0;
 }
 
@@ -2601,9 +2558,6 @@
 int
 Channel::GetRxAgcStatus(bool& enabled, AgcModes& mode)
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                     "Channel::GetRxAgcStatus(enable=?, mode=?)");
-
     bool enable = rx_audioproc_->gain_control()->is_enabled();
     GainControl::Mode agcMode =
         rx_audioproc_->gain_control()->mode();
@@ -2667,9 +2621,6 @@
 int
 Channel::GetRxAgcConfig(AgcConfig& config)
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::GetRxAgcConfig(config=%?)");
-
     config.targetLeveldBOv =
         rx_audioproc_->gain_control()->target_level_dbfs();
     config.digitalCompressionGaindB =
@@ -2677,14 +2628,6 @@
     config.limiterEnable =
         rx_audioproc_->gain_control()->is_limiter_enabled();
 
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-               VoEId(_instanceId,_channelId), "GetRxAgcConfig() => "
-                   "targetLeveldBOv=%u, digitalCompressionGaindB=%u,"
-                   " limiterEnable=%d",
-                   config.targetLeveldBOv,
-                   config.digitalCompressionGaindB,
-                   config.limiterEnable);
-
     return 0;
 }
 
@@ -2750,9 +2693,6 @@
 int
 Channel::GetRxNsStatus(bool& enabled, NsModes& mode)
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::GetRxNsStatus(enable=?, mode=?)");
-
     bool enable =
         rx_audioproc_->noise_suppression()->is_enabled();
     NoiseSuppression::Level ncLevel =
@@ -2776,9 +2716,6 @@
             break;
     }
 
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-               VoEId(_instanceId,_channelId),
-               "GetRxNsStatus() => enabled=%d, mode=%d", enabled, mode);
     return 0;
 }
 
@@ -2804,9 +2741,6 @@
 Channel::GetLocalSSRC(unsigned int& ssrc)
 {
     ssrc = _rtpRtcpModule->SSRC();
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_instanceId,_channelId),
-                 "GetLocalSSRC() => ssrc=%lu", ssrc);
     return 0;
 }
 
@@ -2814,9 +2748,6 @@
 Channel::GetRemoteSSRC(unsigned int& ssrc)
 {
     ssrc = rtp_receiver_->SSRC();
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_instanceId,_channelId),
-                 "GetRemoteSSRC() => ssrc=%lu", ssrc);
     return 0;
 }
 
@@ -2861,9 +2792,6 @@
 {
     RTCPMethod method = _rtpRtcpModule->RTCP();
     enabled = (method != kRtcpOff);
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_instanceId,_channelId),
-                 "GetRTCPStatus() => enabled=%d", enabled);
     return 0;
 }
 
@@ -2902,9 +2830,6 @@
         return -1;
     }
     strcpy(cName, cname);
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_instanceId, _channelId),
-                 "GetRemoteRTCP_CNAME() => cName=%s", cName);
     return 0;
 }
 
@@ -2935,23 +2860,12 @@
     NTPLow = senderInfo.NTPfraction;
     timestamp = senderInfo.RTPtimeStamp;
 
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_instanceId, _channelId),
-                 "GetRemoteRTCPData() => NTPHigh=%lu, NTPLow=%lu, "
-                 "timestamp=%lu",
-                 NTPHigh, NTPLow, timestamp);
-
     // --- Locally derived information
 
     // This value is updated on each incoming RTCP packet (0 when no packet
     // has been received)
     playoutTimestamp = playout_timestamp_rtcp_;
 
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_instanceId, _channelId),
-                 "GetRemoteRTCPData() => playoutTimestamp=%lu",
-                 playout_timestamp_rtcp_);
-
     if (NULL != jitter || NULL != fractionLost)
     {
         // Get all RTCP receiver report blocks that have been received on this
@@ -2985,17 +2899,10 @@
 
         if (jitter) {
           *jitter = it->jitter;
-          WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                       VoEId(_instanceId, _channelId),
-                       "GetRemoteRTCPData() => jitter = %lu", *jitter);
         }
 
         if (fractionLost) {
           *fractionLost = it->fractionLost;
-          WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                       VoEId(_instanceId, _channelId),
-                       "GetRemoteRTCPData() => fractionLost = %lu",
-                       *fractionLost);
         }
     }
     return 0;
@@ -3085,11 +2992,6 @@
 
     discardedPackets = _numberOfDiscardedPackets;
 
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-               VoEId(_instanceId, _channelId),
-               "GetRTPStatistics() => averageJitterMs = %lu, maxJitterMs = %lu,"
-               " discardedPackets = %lu)",
-               averageJitterMs, maxJitterMs, discardedPackets);
     return 0;
 }
 
@@ -3106,8 +3008,6 @@
   // report block according to RFC 3550.
   std::vector<RTCPReportBlock> rtcp_report_blocks;
   if (_rtpRtcpModule->RemoteRTCPStat(&rtcp_report_blocks) != 0) {
-    _engineStatisticsPtr->SetLastError(VE_RTP_RTCP_MODULE_ERROR, kTraceError,
-        "GetRemoteRTCPReportBlocks() failed to read RTCP SR/RR report block.");
     return -1;
   }
 
@@ -3153,22 +3053,8 @@
     stats.extendedMax = statistics.extended_max_sequence_number;
     stats.jitterSamples = statistics.jitter;
 
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_instanceId, _channelId),
-                 "GetRTPStatistics() => fractionLost=%lu, cumulativeLost=%lu,"
-                 " extendedMax=%lu, jitterSamples=%li)",
-                 stats.fractionLost, stats.cumulativeLost, stats.extendedMax,
-                 stats.jitterSamples);
-
     // --- RTT
     stats.rttMs = GetRTT(true);
-    if (stats.rttMs == 0) {
-      WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, _channelId),
-                   "GetRTPStatistics() failed to get RTT");
-    } else {
-      WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId, _channelId),
-                   "GetRTPStatistics() => rttMs=%" PRId64, stats.rttMs);
-    }
 
     // --- Data counters
 
@@ -3195,13 +3081,6 @@
     stats.bytesReceived = bytesReceived;
     stats.packetsReceived = packetsReceived;
 
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_instanceId, _channelId),
-                 "GetRTPStatistics() => bytesSent=%" PRIuS ", packetsSent=%d,"
-                 " bytesReceived=%" PRIuS ", packetsReceived=%d)",
-                 stats.bytesSent, stats.packetsSent, stats.bytesReceived,
-                 stats.packetsReceived);
-
     // --- Timestamps
     {
       CriticalSectionScoped lock(ts_stats_lock_.get());
@@ -3255,15 +3134,8 @@
             return -1;
         }
         redPayloadtype = payloadType;
-        WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                   VoEId(_instanceId, _channelId),
-                   "GetREDStatus() => enabled=%d, redPayloadtype=%d",
-                   enabled, redPayloadtype);
         return 0;
     }
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_instanceId, _channelId),
-                 "GetREDStatus() => enabled=%d", enabled);
     return 0;
 }
 
@@ -3282,9 +3154,6 @@
 
 bool Channel::GetCodecFECStatus() {
   bool enabled = audio_coding_->CodecFEC();
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-               VoEId(_instanceId, _channelId),
-               "GetCodecFECStatus() => enabled=%d", enabled);
   return enabled;
 }
 
@@ -3531,8 +3400,6 @@
 int
 Channel::GetNetworkStatistics(NetworkStatistics& stats)
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::GetNetworkStatistics()");
     return audio_coding_->GetNetworkStatistics(&stats);
 }
 
@@ -3544,15 +3411,11 @@
                                int* playout_buffer_delay_ms) const {
   CriticalSectionScoped cs(video_sync_lock_.get());
   if (_average_jitter_buffer_delay_us == 0) {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::GetDelayEstimate() no valid estimate.");
     return false;
   }
   *jitter_buffer_delay_ms = (_average_jitter_buffer_delay_us + 500) / 1000 +
       _recPacketDelayMs;
   *playout_buffer_delay_ms = playout_delay_ms_;
-  WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-               "Channel::GetDelayEstimate()");
   return true;
 }
 
@@ -3607,8 +3470,6 @@
 }
 
 int Channel::GetPlayoutTimestamp(unsigned int& timestamp) {
-  WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-               "Channel::GetPlayoutTimestamp()");
   uint32_t playout_timestamp_rtp = 0;
   {
     CriticalSectionScoped cs(video_sync_lock_.get());
@@ -3621,9 +3482,6 @@
     return -1;
   }
   timestamp = playout_timestamp_rtp;
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-               VoEId(_instanceId,_channelId),
-               "GetPlayoutTimestamp() => timestamp=%u", timestamp);
   return 0;
 }
 
@@ -3654,8 +3512,6 @@
 int
 Channel::GetRtpRtcp(RtpRtcp** rtpRtcpModule, RtpReceiver** rtp_receiver) const
 {
-    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
-                 "Channel::GetRtpRtcp()");
     *rtpRtcpModule = _rtpRtcpModule.get();
     *rtp_receiver = rtp_receiver_.get();
     return 0;
@@ -3974,7 +3830,6 @@
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
                  "Channel::RegisterReceiveCodecsToRTPModule()");
 
-
     CodecInst codec;
     const uint8_t nSupportedCodecs = AudioCodingModule::NumberOfCodecs();
 
@@ -3989,8 +3844,7 @@
                 codec.channels,
                 (codec.rate < 0) ? 0 : codec.rate) == -1))
         {
-            WEBRTC_TRACE(
-                         kTraceWarning,
+            WEBRTC_TRACE(kTraceWarning,
                          kTraceVoice,
                          VoEId(_instanceId, _channelId),
                          "Channel::RegisterReceiveCodecsToRTPModule() unable"
@@ -4000,8 +3854,7 @@
         }
         else
         {
-            WEBRTC_TRACE(
-                         kTraceInfo,
+            WEBRTC_TRACE(kTraceInfo,
                          kTraceVoice,
                          VoEId(_instanceId, _channelId),
                          "Channel::RegisterReceiveCodecsToRTPModule() %s "
diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc
index a02f298..92b9c6e 100644
--- a/webrtc/voice_engine/transmit_mixer.cc
+++ b/webrtc/voice_engine/transmit_mixer.cc
@@ -645,9 +645,6 @@
 
     if (!_filePlaying)
     {
-        _engineStatisticsPtr->SetLastError(
-            VE_INVALID_OPERATION, kTraceWarning,
-            "StopPlayingFileAsMicrophone() isnot playing");
         return 0;
     }
 
diff --git a/webrtc/voice_engine/voe_audio_processing_impl.cc b/webrtc/voice_engine/voe_audio_processing_impl.cc
index 7569c75..bbc3f0d 100644
--- a/webrtc/voice_engine/voe_audio_processing_impl.cc
+++ b/webrtc/voice_engine/voe_audio_processing_impl.cc
@@ -124,8 +124,6 @@
 }
 
 int VoEAudioProcessingImpl::GetNsStatus(bool& enabled, NsModes& mode) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetNsStatus(enabled=?, mode=?)");
 #ifdef WEBRTC_VOICE_ENGINE_NR
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -150,9 +148,6 @@
       mode = kNsVeryHighSuppression;
       break;
   }
-
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetNsStatus() => enabled=% d, mode=%d", enabled, mode);
   return 0;
 #else
   _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
@@ -228,8 +223,6 @@
 }
 
 int VoEAudioProcessingImpl::GetAgcStatus(bool& enabled, AgcModes& mode) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetAgcStatus(enabled=?, mode=?)");
 #ifdef WEBRTC_VOICE_ENGINE_AGC
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -252,8 +245,6 @@
       break;
   }
 
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetAgcStatus() => enabled=%d, mode=%d", enabled, mode);
   return 0;
 #else
   _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
@@ -302,8 +293,6 @@
 }
 
 int VoEAudioProcessingImpl::GetAgcConfig(AgcConfig& config) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetAgcConfig(config=?)");
 #ifdef WEBRTC_VOICE_ENGINE_AGC
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -317,12 +306,6 @@
   config.limiterEnable =
       _shared->audio_processing()->gain_control()->is_limiter_enabled();
 
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetAgcConfig() => targetLeveldBOv=%u, "
-               "digitalCompressionGaindB=%u, limiterEnable=%d",
-               config.targetLeveldBOv, config.digitalCompressionGaindB,
-               config.limiterEnable);
-
   return 0;
 #else
   _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
@@ -359,8 +342,6 @@
 int VoEAudioProcessingImpl::GetRxNsStatus(int channel,
                                           bool& enabled,
                                           NsModes& mode) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRxNsStatus(channel=%d, enable=?, mode=?)", channel);
 #ifdef WEBRTC_VOICE_ENGINE_NR
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -412,8 +393,6 @@
 int VoEAudioProcessingImpl::GetRxAgcStatus(int channel,
                                            bool& enabled,
                                            AgcModes& mode) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRxAgcStatus(channel=%d, enable=?, mode=?)", channel);
 #ifdef WEBRTC_VOICE_ENGINE_AGC
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -460,8 +439,6 @@
 }
 
 int VoEAudioProcessingImpl::GetRxAgcConfig(int channel, AgcConfig& config) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRxAgcConfig(channel=%d)", channel);
 #ifdef WEBRTC_VOICE_ENGINE_AGC
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -609,8 +586,6 @@
 }
 
 int VoEAudioProcessingImpl::GetEcStatus(bool& enabled, EcModes& mode) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetEcStatus()");
 #ifdef WEBRTC_VOICE_ENGINE_ECHO
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -625,8 +600,6 @@
     enabled = _shared->audio_processing()->echo_control_mobile()->is_enabled();
   }
 
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetEcStatus() => enabled=%i, mode=%i", enabled, (int)mode);
   return 0;
 #else
   _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
@@ -642,8 +615,6 @@
 }
 
 int VoEAudioProcessingImpl::DelayOffsetMs() {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "DelayOffsetMs()");
   return _shared->audio_processing()->delay_offset_ms();
 }
 
@@ -700,8 +671,6 @@
 }
 
 int VoEAudioProcessingImpl::GetAecmMode(AecmModes& mode, bool& enabledCNG) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetAECMMode(mode=?)");
 #ifdef WEBRTC_VOICE_ENGINE_ECHO
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -756,8 +725,6 @@
 }
 
 bool VoEAudioProcessingImpl::IsHighPassFilterEnabled() {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "IsHighPassFilterEnabled()");
   return _shared->audio_processing()->high_pass_filter()->is_enabled();
 }
 
@@ -844,8 +811,6 @@
 }
 
 int VoEAudioProcessingImpl::GetEcMetricsStatus(bool& enabled) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetEcMetricsStatus(enabled=?)");
 #ifdef WEBRTC_VOICE_ENGINE_ECHO
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -867,8 +832,6 @@
 
   enabled = echo_mode;
 
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetEcMetricsStatus() => enabled=%d", enabled);
   return 0;
 #else
   _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
@@ -881,8 +844,6 @@
                                            int& ERLE,
                                            int& RERL,
                                            int& A_NLP) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetEchoMetrics(ERL=?, ERLE=?, RERL=?, A_NLP=?)");
 #ifdef WEBRTC_VOICE_ENGINE_ECHO
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -910,9 +871,6 @@
   RERL = echoMetrics.residual_echo_return_loss.instant;
   A_NLP = echoMetrics.a_nlp.instant;
 
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetEchoMetrics() => ERL=%d, ERLE=%d, RERL=%d, A_NLP=%d", ERL,
-               ERLE, RERL, A_NLP);
   return 0;
 #else
   _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
@@ -924,8 +882,6 @@
 int VoEAudioProcessingImpl::GetEcDelayMetrics(int& delay_median,
                                               int& delay_std,
                                               float& fraction_poor_delays) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetEcDelayMetrics(median=?, std=?, fraction_poor_delays=?)");
 #ifdef WEBRTC_VOICE_ENGINE_ECHO
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -955,10 +911,6 @@
   delay_std = std;
   fraction_poor_delays = poor_fraction;
 
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetEcDelayMetrics() => delay_median=%d, delay_std=%d, "
-               "fraction_poor_delays=%f",
-               delay_median, delay_std, fraction_poor_delays);
   return 0;
 #else
   _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
@@ -1032,8 +984,6 @@
 }
 
 int VoEAudioProcessingImpl::GetTypingDetectionStatus(bool& enabled) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetTypingDetectionStatus()");
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -1047,8 +997,6 @@
 }
 
 int VoEAudioProcessingImpl::TimeSinceLastTyping(int& seconds) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "TimeSinceLastTyping()");
 #if !defined(WEBRTC_VOICE_ENGINE_TYPING_DETECTION)
   NOT_SUPPORTED(_shared->statistics());
 #else
diff --git a/webrtc/voice_engine/voe_codec_impl.cc b/webrtc/voice_engine/voe_codec_impl.cc
index a4d0b7d..2bbc78a 100644
--- a/webrtc/voice_engine/voe_codec_impl.cc
+++ b/webrtc/voice_engine/voe_codec_impl.cc
@@ -45,20 +45,12 @@
 }
 
 int VoECodecImpl::NumOfCodecs() {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "NumOfCodecs()");
-
   // Number of supported codecs in the ACM
   uint8_t nSupportedCodecs = AudioCodingModule::NumberOfCodecs();
-
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "NumOfCodecs() => %u", nSupportedCodecs);
   return (nSupportedCodecs);
 }
 
 int VoECodecImpl::GetCodec(int index, CodecInst& codec) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetCodec(index=%d, codec=?)", index);
   CodecInst acmCodec;
   if (AudioCodingModule::Codec(index, &acmCodec) == -1) {
     _shared->SetLastError(VE_INVALID_LISTNR, kTraceError,
@@ -66,11 +58,6 @@
     return -1;
   }
   ACMToExternalCodecRepresentation(codec, acmCodec);
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetCodec() => plname=%s, pacsize=%d, plfreq=%d, pltype=%d, "
-               "channels=%d, rate=%d",
-               codec.plname, codec.pacsize, codec.plfreq, codec.pltype,
-               codec.channels, codec.rate);
   return 0;
 }
 
@@ -130,8 +117,6 @@
 }
 
 int VoECodecImpl::GetSendCodec(int channel, CodecInst& codec) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSendCodec(channel=%d, codec=?)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -150,11 +135,6 @@
     return -1;
   }
   ACMToExternalCodecRepresentation(codec, acmCodec);
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSendCodec() => plname=%s, pacsize=%d, plfreq=%d, "
-               "channels=%d, rate=%d",
-               codec.plname, codec.pacsize, codec.plfreq, codec.channels,
-               codec.rate);
   return 0;
 }
 
@@ -171,8 +151,6 @@
 }
 
 int VoECodecImpl::GetRecCodec(int channel, CodecInst& codec) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRecCodec(channel=%d, codec=?)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -186,16 +164,9 @@
   }
   CodecInst acmCodec;
   if (channelPtr->GetRecCodec(acmCodec) != 0) {
-    _shared->SetLastError(VE_CANNOT_GET_REC_CODEC, kTraceError,
-                          "GetRecCodec() failed to get received codec");
     return -1;
   }
   ACMToExternalCodecRepresentation(codec, acmCodec);
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRecCodec() => plname=%s, pacsize=%d, plfreq=%d, "
-               "channels=%d, rate=%d",
-               codec.plname, codec.pacsize, codec.plfreq, codec.channels,
-               codec.rate);
   return 0;
 }
 
@@ -222,8 +193,6 @@
 }
 
 int VoECodecImpl::GetRecPayloadType(int channel, CodecInst& codec) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRecPayloadType(channel=%d, codec)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -290,8 +259,6 @@
 }
 
 int VoECodecImpl::GetFECStatus(int channel, bool& enabled) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetCodecFECStatus(channel=%d)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -349,9 +316,6 @@
                                bool& enabled,
                                VadModes& mode,
                                bool& disabledDTX) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetVADStatus(channel=%i)", channel);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
diff --git a/webrtc/voice_engine/voe_dtmf_impl.cc b/webrtc/voice_engine/voe_dtmf_impl.cc
index 26cc3a8..f9e5a7c 100644
--- a/webrtc/voice_engine/voe_dtmf_impl.cc
+++ b/webrtc/voice_engine/voe_dtmf_impl.cc
@@ -150,8 +150,6 @@
 
 int VoEDtmfImpl::GetSendTelephoneEventPayloadType(int channel,
                                                   unsigned char& type) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSendTelephoneEventPayloadType(channel=%d)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -208,17 +206,10 @@
 }
 
 int VoEDtmfImpl::GetDtmfFeedbackStatus(bool& enabled, bool& directFeedback) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetDtmfFeedbackStatus()");
-
   CriticalSectionScoped sc(_shared->crit_sec());
 
   enabled = _dtmfFeedback;
   directFeedback = _dtmfDirectFeedback;
-
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetDtmfFeedbackStatus() => enabled=%d, directFeedback=%d",
-               enabled, directFeedback);
   return 0;
 }
 #endif  // #ifdef WEBRTC_VOICE_ENGINE_DTMF_API
diff --git a/webrtc/voice_engine/voe_external_media_impl.cc b/webrtc/voice_engine/voe_external_media_impl.cc
index f6d3a31..df42df4 100644
--- a/webrtc/voice_engine/voe_external_media_impl.cc
+++ b/webrtc/voice_engine/voe_external_media_impl.cc
@@ -124,10 +124,6 @@
 
 int VoEExternalMediaImpl::GetAudioFrame(int channel, int desired_sample_rate_hz,
                                         AudioFrame* frame) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice,
-               VoEId(shared_->instance_id(), channel),
-               "GetAudioFrame(channel=%d, desired_sample_rate_hz=%d)", channel,
-               desired_sample_rate_hz);
   if (!shared_->statistics().Initialized()) {
     shared_->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
diff --git a/webrtc/voice_engine/voe_file_impl.cc b/webrtc/voice_engine/voe_file_impl.cc
index bc9245f..f24127b 100644
--- a/webrtc/voice_engine/voe_file_impl.cc
+++ b/webrtc/voice_engine/voe_file_impl.cc
@@ -124,8 +124,6 @@
 }
 
 int VoEFileImpl::IsPlayingFileLocally(int channel) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "IsPlayingFileLocally(channel=%d)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
diff --git a/webrtc/voice_engine/voe_hardware_impl.cc b/webrtc/voice_engine/voe_hardware_impl.cc
index b4a39f3..b2bb871 100644
--- a/webrtc/voice_engine/voe_hardware_impl.cc
+++ b/webrtc/voice_engine/voe_hardware_impl.cc
@@ -82,9 +82,6 @@
 }
 
 int VoEHardwareImpl::GetAudioDeviceLayer(AudioLayers& audioLayer) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetAudioDeviceLayer(devices=?)");
-
   // Can always be called regardless of VoE state
 
   AudioDeviceModule::AudioLayer activeLayer(
@@ -124,15 +121,9 @@
                             "  unknown audio layer");
   }
 
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "  Output: audioLayer=%d", audioLayer);
-
   return 0;
 }
 int VoEHardwareImpl::GetNumOfRecordingDevices(int& devices) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetNumOfRecordingDevices(devices=?)");
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -140,16 +131,10 @@
 
   devices = static_cast<int>(_shared->audio_device()->RecordingDevices());
 
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "  Output: devices=%d", devices);
-
   return 0;
 }
 
 int VoEHardwareImpl::GetNumOfPlayoutDevices(int& devices) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetNumOfPlayoutDevices(devices=?)");
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -157,18 +142,12 @@
 
   devices = static_cast<int>(_shared->audio_device()->PlayoutDevices());
 
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "  Output: devices=%d", devices);
-
   return 0;
 }
 
 int VoEHardwareImpl::GetRecordingDeviceName(int index,
                                             char strNameUTF8[128],
                                             char strGuidUTF8[128]) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRecordingDeviceName(index=%d)", index);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -200,14 +179,9 @@
 
   // Copy to vectors supplied by user
   strncpy(strNameUTF8, name, strLen);
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "  Output: strNameUTF8=%s", strNameUTF8);
 
   if (strGuidUTF8 != NULL) {
     strncpy(strGuidUTF8, guid, strLen);
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_shared->instance_id(), -1), "  Output: strGuidUTF8=%s",
-                 strGuidUTF8);
   }
 
   return 0;
@@ -216,9 +190,6 @@
 int VoEHardwareImpl::GetPlayoutDeviceName(int index,
                                           char strNameUTF8[128],
                                           char strGuidUTF8[128]) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetPlayoutDeviceName(index=%d)", index);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -250,14 +221,9 @@
 
   // Copy to vectors supplied by user
   strncpy(strNameUTF8, name, strLen);
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "  Output: strNameUTF8=%s", strNameUTF8);
 
   if (strGuidUTF8 != NULL) {
     strncpy(strGuidUTF8, guid, strLen);
-    WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
-                 VoEId(_shared->instance_id(), -1), "  Output: strGuidUTF8=%s",
-                 strGuidUTF8);
   }
 
   return 0;
@@ -473,8 +439,6 @@
 }
 
 int VoEHardwareImpl::RecordingSampleRate(unsigned int* samples_per_sec) const {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "%s", __FUNCTION__);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return false;
@@ -493,8 +457,6 @@
 }
 
 int VoEHardwareImpl::PlayoutSampleRate(unsigned int* samples_per_sec) const {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "%s", __FUNCTION__);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return false;
diff --git a/webrtc/voice_engine/voe_neteq_stats_impl.cc b/webrtc/voice_engine/voe_neteq_stats_impl.cc
index b6b00d4..0118fd0 100644
--- a/webrtc/voice_engine/voe_neteq_stats_impl.cc
+++ b/webrtc/voice_engine/voe_neteq_stats_impl.cc
@@ -47,9 +47,6 @@
 
 int VoENetEqStatsImpl::GetNetworkStatistics(int channel,
                                             NetworkStatistics& stats) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetNetworkStatistics(channel=%d, stats=?)", channel);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
diff --git a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
index c98dd90..9fd38ef 100644
--- a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
+++ b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
@@ -63,8 +63,6 @@
 }
 
 int VoERTP_RTCPImpl::GetLocalSSRC(int channel, unsigned int& ssrc) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetLocalSSRC(channel=%d, ssrc=?)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -80,8 +78,6 @@
 }
 
 int VoERTP_RTCPImpl::GetRemoteSSRC(int channel, unsigned int& ssrc) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRemoteSSRC(channel=%d, ssrc=?)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -243,8 +239,6 @@
 }
 
 int VoERTP_RTCPImpl::GetRTCPStatus(int channel, bool& enabled) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRTCPStatus(channel=%d)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -277,8 +271,6 @@
 }
 
 int VoERTP_RTCPImpl::GetRemoteRTCP_CNAME(int channel, char cName[256]) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRemoteRTCP_CNAME(channel=%d, cName=?)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -302,8 +294,6 @@
     unsigned int* jitter,            // from report block 1 in SR/RR
     unsigned short* fractionLost)    // from report block 1 in SR/RR
 {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRemoteRTCPData(channel=%d,...)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -323,8 +313,6 @@
                                       unsigned int& averageJitterMs,
                                       unsigned int& maxJitterMs,
                                       unsigned int& discardedPackets) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRTPStatistics(channel=%d,....)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -341,8 +329,6 @@
 }
 
 int VoERTP_RTCPImpl::GetRTCPStatistics(int channel, CallStatistics& stats) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRTCPStatistics(channel=%d)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -359,8 +345,6 @@
 
 int VoERTP_RTCPImpl::GetRemoteRTCPReportBlocks(
     int channel, std::vector<ReportBlock>* report_blocks) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRemoteRTCPReportBlocks(channel=%d)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -405,9 +389,6 @@
 int VoERTP_RTCPImpl::GetREDStatus(int channel,
                                   bool& enabled,
                                   int& redPayloadtype) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetREDStatus(channel=%d, enabled=?, redPayloadtype=?)",
-               channel);
 #ifdef WEBRTC_CODEC_RED
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
diff --git a/webrtc/voice_engine/voe_video_sync_impl.cc b/webrtc/voice_engine/voe_video_sync_impl.cc
index 8896c90..4dea6fa 100644
--- a/webrtc/voice_engine/voe_video_sync_impl.cc
+++ b/webrtc/voice_engine/voe_video_sync_impl.cc
@@ -45,9 +45,6 @@
 
 int VoEVideoSyncImpl::GetPlayoutTimestamp(int channel,
                                           unsigned int& timestamp) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetPlayoutTimestamp(channel=%d, timestamp=?)", channel);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -141,9 +138,6 @@
 int VoEVideoSyncImpl::GetDelayEstimate(int channel,
                                        int* jitter_buffer_delay_ms,
                                        int* playout_buffer_delay_ms) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetDelayEstimate(channel=%d, delayMs=?)", channel);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -163,9 +157,6 @@
 }
 
 int VoEVideoSyncImpl::GetPlayoutBufferSize(int& bufferMs) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetPlayoutBufferSize(bufferMs=?)");
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -178,17 +169,12 @@
     return -1;
   }
   bufferMs = sizeMS;
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetPlayoutBufferSize() => bufferMs=%d", bufferMs);
   return 0;
 }
 
 int VoEVideoSyncImpl::GetRtpRtcp(int channel,
                                  RtpRtcp** rtpRtcpModule,
                                  RtpReceiver** rtp_receiver) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetRtpRtcp(channel=%i)", channel);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -204,9 +190,6 @@
 }
 
 int VoEVideoSyncImpl::GetLeastRequiredDelayMs(int channel) const {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetLeastRequiredDelayMS(channel=%d)", channel);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
diff --git a/webrtc/voice_engine/voe_volume_control_impl.cc b/webrtc/voice_engine/voe_volume_control_impl.cc
index 3d8a7a8..d0f3de1 100644
--- a/webrtc/voice_engine/voe_volume_control_impl.cc
+++ b/webrtc/voice_engine/voe_volume_control_impl.cc
@@ -83,8 +83,6 @@
 }
 
 int VoEVolumeControlImpl::GetSpeakerVolume(unsigned int& volume) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSpeakerVolume()");
 
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -111,8 +109,6 @@
   volume =
       (uint32_t)((spkrVol * kMaxVolumeLevel + (int)(maxVol / 2)) / (maxVol));
 
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSpeakerVolume() => volume=%d", volume);
   return 0;
 }
 
@@ -169,9 +165,6 @@
 }
 
 int VoEVolumeControlImpl::GetMicVolume(unsigned int& volume) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetMicVolume()");
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -200,9 +193,6 @@
     // Truncate the value to the kMaxVolumeLevel.
     volume = kMaxVolumeLevel;
   }
-
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetMicVolume() => volume=%d", volume);
   return 0;
 }
 
@@ -230,9 +220,6 @@
 }
 
 int VoEVolumeControlImpl::GetInputMute(int channel, bool& enabled) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetInputMute(channel=%d)", channel);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -249,31 +236,21 @@
     }
     enabled = channelPtr->Mute();
   }
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetInputMute() => enabled = %d", (int)enabled);
   return 0;
 }
 
 int VoEVolumeControlImpl::GetSpeechInputLevel(unsigned int& level) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSpeechInputLevel()");
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
   int8_t currentLevel = _shared->transmit_mixer()->AudioLevel();
   level = static_cast<unsigned int>(currentLevel);
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSpeechInputLevel() => %d", level);
   return 0;
 }
 
 int VoEVolumeControlImpl::GetSpeechOutputLevel(int channel,
                                                unsigned int& level) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSpeechOutputLevel(channel=%d, level=?)", channel);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -294,25 +271,17 @@
 }
 
 int VoEVolumeControlImpl::GetSpeechInputLevelFullRange(unsigned int& level) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSpeechInputLevelFullRange(level=?)");
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
   int16_t currentLevel = _shared->transmit_mixer()->AudioLevelFullRange();
   level = static_cast<unsigned int>(currentLevel);
-  WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSpeechInputLevelFullRange() => %d", level);
   return 0;
 }
 
 int VoEVolumeControlImpl::GetSpeechOutputLevelFullRange(int channel,
                                                         unsigned int& level) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetSpeechOutputLevelFullRange(channel=%d, level=?)", channel);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -361,8 +330,6 @@
 
 int VoEVolumeControlImpl::GetChannelOutputVolumeScaling(int channel,
                                                         float& scaling) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetChannelOutputVolumeScaling(channel=%d, scaling=?)", channel);
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
@@ -422,9 +389,6 @@
 int VoEVolumeControlImpl::GetOutputVolumePan(int channel,
                                              float& left,
                                              float& right) {
-  WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
-               "GetOutputVolumePan(channel=%d, left=?, right=?)", channel);
-
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;