From acb00505b6624712669f92b181e234099c76ecae Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Fri, 4 Oct 2013 16:59:17 +0000 Subject: [PATCH] Only declare kDelayDiffOffset when used. And remove the redundant Windows block. R=hans@chromium.org, niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2351004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4922 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_processing/aec/echo_cancellation.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation.c b/webrtc/modules/audio_processing/aec/echo_cancellation.c index 27da67de51..57208cd907 100644 --- a/webrtc/modules/audio_processing/aec/echo_cancellation.c +++ b/webrtc/modules/audio_processing/aec/echo_cancellation.c @@ -66,18 +66,19 @@ // GTP/Linux(ChromeOS): TBD, but for the moment we will trust the values. #if defined(WEBRTC_CHROMIUM_BUILD) && defined(WEBRTC_MAC) #define WEBRTC_UNTRUSTED_DELAY + +#if defined(WEBRTC_MAC) +static const int kDelayDiffOffsetSamples = -160; +#else +// Not enabled for now. +static const int kDelayDiffOffsetSamples = 0; +#endif #endif #if defined(WEBRTC_MAC) static const int kFixedDelayMs = 20; -static const int kDelayDiffOffsetSamples = -160; -#elif defined(WEBRTC_WIN) -static const int kFixedDelayMs = 50; -static const int kDelayDiffOffsetSamples = 0; #else -// Essentially ChromeOS. static const int kFixedDelayMs = 50; -static const int kDelayDiffOffsetSamples = 0; #endif static const int kMinTrustedDelayMs = 20; static const int kMaxTrustedDelayMs = 500;