Updating Opus to release 1.1

celt/x86/pitch_sse.h

 /* Copyright (c) 2013 Jean-Marc Valin and John Ridges */
 /**
    @file pitch_sse.h
    @brief Pitch analysis
  */
 
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
@@ skipping 18 matching lines @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifndef PITCH_SSE_H
 #define PITCH_SSE_H
 
 #include <xmmintrin.h>
 #include "arch.h"
 
 #define OVERRIDE_XCORR_KERNEL
-static inline void xcorr_kernel(const opus_val16 *x, const opus_val16 *y, opus_val32 sum[4], int len)
+static OPUS_INLINE void xcorr_kernel(const opus_val16 *x, const opus_val16 *y, opus_val32 sum[4], int len)
 {
    int j;
    __m128 xsum1, xsum2;
    xsum1 = _mm_loadu_ps(sum);
    xsum2 = _mm_setzero_ps();
 
    for (j = 0; j < len-3; j += 4)
    {
       __m128 x0 = _mm_loadu_ps(x+j);
       __m128 yj = _mm_loadu_ps(y+j);
@@ skipping 15 matching lines @@
          if (++j < len)
          {
             xsum1 = _mm_add_ps(xsum1,_mm_mul_ps(_mm_load1_ps(x+j),_mm_loadu_ps(y+j)));
          }
       }
    }
    _mm_storeu_ps(sum,_mm_add_ps(xsum1,xsum2));
 }
 
 #define OVERRIDE_DUAL_INNER_PROD
-static inline void dual_inner_prod(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
+static OPUS_INLINE void dual_inner_prod(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
       int N, opus_val32 *xy1, opus_val32 *xy2)
 {
    int i;
    __m128 xsum1, xsum2;
    xsum1 = _mm_setzero_ps();
    xsum2 = _mm_setzero_ps();
    for (i=0;i<N-3;i+=4)
    {
       __m128 xi = _mm_loadu_ps(x+i);
       __m128 y1i = _mm_loadu_ps(y01+i);
       __m128 y2i = _mm_loadu_ps(y02+i);
       xsum1 = _mm_add_ps(xsum1,_mm_mul_ps(xi, y1i));
       xsum2 = _mm_add_ps(xsum2,_mm_mul_ps(xi, y2i));
    }
    /* Horizontal sum */
    xsum1 = _mm_add_ps(xsum1, _mm_movehl_ps(xsum1, xsum1));
    xsum1 = _mm_add_ss(xsum1, _mm_shuffle_ps(xsum1, xsum1, 0x55));
    _mm_store_ss(xy1, xsum1);
    xsum2 = _mm_add_ps(xsum2, _mm_movehl_ps(xsum2, xsum2));
    xsum2 = _mm_add_ss(xsum2, _mm_shuffle_ps(xsum2, xsum2, 0x55));
    _mm_store_ss(xy2, xsum2);
    for (;i<N;i++)
    {
       *xy1 = MAC16_16(*xy1, x[i], y01[i]);
       *xy2 = MAC16_16(*xy2, x[i], y02[i]);
    }
 }
 
 #define OVERRIDE_COMB_FILTER_CONST
-static inline void comb_filter_const(opus_val32 *y, opus_val32 *x, int T, int N,
+static OPUS_INLINE void comb_filter_const(opus_val32 *y, opus_val32 *x, int T, int N,
       opus_val16 g10, opus_val16 g11, opus_val16 g12)
 {
    int i;
    __m128 x0v;
    __m128 g10v, g11v, g12v;
    g10v = _mm_load1_ps(&g10);
    g11v = _mm_load1_ps(&g11);
    g12v = _mm_load1_ps(&g12);
    x0v = _mm_loadu_ps(&x[-T-2]);
    for (i=0;i<N-3;i+=4)
@@ skipping 31 matching lines @@
    {
       y[i] = x[i]
                + MULT16_32_Q15(g10,x[i-T])
                + MULT16_32_Q15(g11,ADD32(x[i-T+1],x[i-T-1]))
                + MULT16_32_Q15(g12,ADD32(x[i-T+2],x[i-T-2]));
    }
 #endif
 }
 
 #endif