Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1312)

Unified Diff: webrtc/voice_engine/channel.cc

Issue 1338283002: Remove the preprocessor symbol WEBRTC_CODEC_AVT (it was always defined) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@ifdef
Patch Set: rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index d602bb4fdfc47bd63d44c66e780d29129fb7c726..fb29dfabab35ee5dbcf3d481de0449d65f8060e2 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -932,12 +932,8 @@ Channel::Init()
// --- ACM initialization
if ((audio_coding_->InitializeReceiver() == -1)
-#ifdef WEBRTC_CODEC_AVT
// out-of-band Dtmf tones are played out by default
- || (audio_coding_->SetDtmfPlayoutStatus(true) == -1)
-#endif
- )
- {
+ || (audio_coding_->SetDtmfPlayoutStatus(true) == -1)) {
_engineStatisticsPtr->SetLastError(
VE_AUDIO_CODING_MODULE_ERROR, kTraceError,
"Channel::Init() unable to initialize the ACM - 1");
« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698