generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modules/audio_processing: Moves declaration of kDelayDiffOffsetSamples

Browse Source 
audio_processing did not compile when aec_untrusted_delay_for_testing=1 was set. The constant kDelayDiffOffsetSamples was declared only for Mac when WEBRTC_UNTRUSTED_DELAY was automatically turned on.

Moving the declaration outside the ifdef makes it build with the flag on for any platform.

BUG=3673
TESTED=locally and trybots
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/22049004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6866 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@webrtc.org
2014-08-11 15:39:00 +00:00
parent 4e4b0984da
commit 820f8e9ca7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,14 +66,14 @@
// 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
#endif
#if defined(WEBRTC_MAC) #if defined(WEBRTC_UNTRUSTED_DELAY) && defined(WEBRTC_MAC)
static const int kDelayDiffOffsetSamples = -160; static const int kDelayDiffOffsetSamples = -160;
#else #else
// Not enabled for now. // Not enabled for now.
static const int kDelayDiffOffsetSamples = 0; 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;
@@ -790,12 +790,11 @@ static void ProcessExtended(aecpc_t* self,
int32_t skew) { int32_t skew) {
int i; int i;
const int num_frames = num_samples / FRAME_LEN; const int num_frames = num_samples / FRAME_LEN;
#if defined(WEBRTC_UNTRUSTED_DELAY)
const int delay_diff_offset = kDelayDiffOffsetSamples; const int delay_diff_offset = kDelayDiffOffsetSamples;
#if defined(WEBRTC_UNTRUSTED_DELAY)
reported_delay_ms = kFixedDelayMs; reported_delay_ms = kFixedDelayMs;
#else #else
// This is the usual mode where we trust the reported system delay values. // This is the usual mode where we trust the reported system delay values.
const int delay_diff_offset = 0;
// Due to the longer filter, we no longer add 10 ms to the reported delay // Due to the longer filter, we no longer add 10 ms to the reported delay
// to reduce chance of non-causality. Instead we apply a minimum here to avoid // to reduce chance of non-causality. Instead we apply a minimum here to avoid
// issues with the read pointer jumping around needlessly. // issues with the read pointer jumping around needlessly.