zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only declare kDelayDiffOffset when used.

Browse Source 
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
This commit is contained in:
andrew@webrtc.org
2013-10-04 16:59:17 +00:00
parent ad2eb6f67d
commit acb00505b6
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/modules/audio_processing/aec/echo_cancellation.c
View File

@ -66,18 +66,19 @@
// GTP/Linux(ChromeOS): TBD, but for the moment we will trust the values. // GTP/Linux(ChromeOS): TBD, but for the moment we will trust the values.
#if defined(WEBRTC_CHROMIUM_BUILD) && defined(WEBRTC_MAC) #if defined(WEBRTC_CHROMIUM_BUILD) && defined(WEBRTC_MAC)
#define WEBRTC_UNTRUSTED_DELAY #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 #endif
#if defined(WEBRTC_MAC) #if defined(WEBRTC_MAC)
static const int kFixedDelayMs = 20; 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 #else
// Essentially ChromeOS.
static const int kFixedDelayMs = 50; static const int kFixedDelayMs = 50;
static const int kDelayDiffOffsetSamples = 0;
#endif #endif
static const int kMinTrustedDelayMs = 20; static const int kMinTrustedDelayMs = 20;
static const int kMaxTrustedDelayMs = 500; static const int kMaxTrustedDelayMs = 500;