diff options
| author | Linfeng Zhang <linfengz@google.com> | 2016-09-07 15:44:23 -0700 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2017-06-06 17:12:20 -0400 |
| commit | 85fb8a1d17a563d1e7989e8268a856a5c90ecfe7 (patch) | |
| tree | 1430fd2fab2f4e6d9d35be144777bd2c687d04f6 /celt/pitch.c | |
| parent | a1ae821c964960ed659134e8f834ba31a3db1a6b (diff) | |
| download | libopus-85fb8a1d17a563d1e7989e8268a856a5c90ecfe7.tar.gz | |
Replace call of celt_inner_prod_c() (step 2)
Should call celt_inner_prod().
This requires the API change of celt_pitch_xcorr() by passing in
"arch".
We tested on x86 and arm, and got bit exact results as original.
Change-Id: I606915da6a196f327ce81f4a5ae32811f4c1fabb
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
Diffstat (limited to 'celt/pitch.c')
| -rw-r--r-- | celt/pitch.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/celt/pitch.c b/celt/pitch.c index 1ca68bf6..5b061d86 100644 --- a/celt/pitch.c +++ b/celt/pitch.c @@ -220,13 +220,8 @@ opus_val32 #else void #endif -#if defined(OVERRIDE_PITCH_XCORR) celt_pitch_xcorr_c(const opus_val16 *_x, const opus_val16 *_y, - opus_val32 *xcorr, int len, int max_pitch) -#else -celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y, opus_val32 *xcorr, int len, int max_pitch, int arch) -#endif { #if 0 /* This is a simple version of the pitch correlation that should work @@ -265,11 +260,7 @@ celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y, for (i=0;i<max_pitch-3;i+=4) { opus_val32 sum[4]={0,0,0,0}; -#if defined(OVERRIDE_PITCH_XCORR) - xcorr_kernel_c(_x, _y+i, sum, len); -#else xcorr_kernel(_x, _y+i, sum, len, arch); -#endif xcorr[i]=sum[0]; xcorr[i+1]=sum[1]; xcorr[i+2]=sum[2]; @@ -285,11 +276,7 @@ celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y, for (;i<max_pitch;i++) { opus_val32 sum; -#if defined(OVERRIDE_PITCH_XCORR) - sum = celt_inner_prod_c(_x, _y+i, len); -#else sum = celt_inner_prod(_x, _y+i, len, arch); -#endif xcorr[i] = sum; #ifdef FIXED_POINT maxcorr = MAX32(maxcorr, sum); |