Updating Opus to release 1.1

silk/float/prefilter_FLP.c

 /***********************************************************************
 Copyright (c) 2006-2011, Skype Limited. All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 - Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
 - Redistributions in binary form must reproduce the above copyright
 notice, this list of conditions and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
@@ skipping 17 matching lines @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "main_FLP.h"
 #include "tuning_parameters.h"
 
 /*
 * Prefilter for finding Quantizer input signal
 */
-static inline void silk_prefilt_FLP(
+static OPUS_INLINE void silk_prefilt_FLP(
     silk_prefilter_state_FLP    *P,                 /* I/O state */
     silk_float                  st_res[],           /* I */
     silk_float                  xw[],               /* O */
     silk_float                  *HarmShapeFIR,      /* I */
     silk_float                  Tilt,               /* I */
     silk_float                  LF_MA_shp,          /* I */
     silk_float                  LF_AR_shp,          /* I */
     opus_int                    lag,                /* I */
     opus_int                    length              /* I */
 );
@@ skipping 97 matching lines @@
 
         px  += psEnc->sCmn.subfr_length;
         pxw += psEnc->sCmn.subfr_length;
     }
     P->lagPrev = psEncCtrl->pitchL[ psEnc->sCmn.nb_subfr - 1 ];
 }
 
 /*
 * Prefilter for finding Quantizer input signal
 */
-static inline void silk_prefilt_FLP(
+static OPUS_INLINE void silk_prefilt_FLP(
     silk_prefilter_state_FLP    *P,                 /* I/O state */
     silk_float                  st_res[],           /* I */
     silk_float                  xw[],               /* O */
     silk_float                  *HarmShapeFIR,      /* I */
     silk_float                  Tilt,               /* I */
     silk_float                  LF_MA_shp,          /* I */
     silk_float                  LF_AR_shp,          /* I */
     opus_int                    lag,                /* I */
     opus_int                    length              /* I */
 )
@@ skipping 30 matching lines @@
         LTP_shp_buf_idx = ( LTP_shp_buf_idx - 1 ) & LTP_MASK;
         LTP_shp_buf[ LTP_shp_buf_idx ] = sLF_MA_shp;
 
         xw[ i ] = sLF_MA_shp - n_LTP;
     }
     /* Copy temp variable back to state */
     P->sLF_AR_shp       = sLF_AR_shp;
     P->sLF_MA_shp       = sLF_MA_shp;
     P->sLTP_shp_buf_idx = LTP_shp_buf_idx;
 }