commit acb00505b6624712669f92b181e234099c76ecae
author andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Oct 04 16:59:17 2013
committer andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Oct 04 16:59:17 2013
tree fbd851b42caacddc2fc8855dbb38e6ec27088d63
parent ad2eb6f67db6d6e7a953f7c8b45d34d2352bf40d

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

webrtc/modules/audio_processing/aec/echo_cancellation.c

diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation.c b/webrtc/modules/audio_processing/aec/echo_cancellation.c
index 27da67d..57208cd 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;