Name change resampler.c/h to aec_resampler.c/h.

To avoid possible conflict with resampler in common_audio.
Review URL: http://webrtc-codereview.appspot.com/296006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1046 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@webrtc.org 2011-11-29 08:44:01 +00:00
parent 611e4c3253
commit 4b80eb4fcd
5 changed files with 6 additions and 5 deletions

View File

@ -17,7 +17,7 @@ LOCAL_MODULE := libwebrtc_aec
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
echo_cancellation.c \ echo_cancellation.c \
resampler.c \ aec_resampler.c \
aec_core.c \ aec_core.c \
aec_rdft.c \ aec_rdft.c \
aec_core_sse2.c \ aec_core_sse2.c \

View File

@ -36,8 +36,8 @@
'aec_rdft.h', 'aec_rdft.h',
'aec_rdft.c', 'aec_rdft.c',
'aec_rdft_sse2.c', 'aec_rdft_sse2.c',
'resampler.h', 'aec_resampler.h',
'resampler.c', 'aec_resampler.c',
], ],
'conditions': [ 'conditions': [
['aec_debug_dump==1', { ['aec_debug_dump==1', {

View File

@ -12,12 +12,13 @@
* skew by resampling the farend signal. * skew by resampling the farend signal.
*/ */
#include "aec_resampler.h"
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "resampler.h"
#include "aec_core.h" #include "aec_core.h"
enum { kFrameBufferSize = FRAME_LEN * 4 }; enum { kFrameBufferSize = FRAME_LEN * 4 };

View File

@ -21,7 +21,7 @@
#include <string.h> #include <string.h>
#include "aec_core.h" #include "aec_core.h"
#include "resampler.h" #include "aec_resampler.h"
#include "ring_buffer.h" #include "ring_buffer.h"
#define BUF_SIZE_FRAMES 50 // buffer size (frames) #define BUF_SIZE_FRAMES 50 // buffer size (frames)