diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-24 02:18:17 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-24 02:18:17 +0000 |
commit | 29a0dda797b58108d148e7f25371f892f84205d4 (patch) | |
tree | 93db20ddff9e7822901fbef37f2a352e48426a3f /silk/float/SigProc_FLP.h | |
parent | 3ff27560eb001d23e76aaae0f24f80e598fa2c8e (diff) | |
parent | 36fa2621472ebf5b859fd16bbdb749019c68cc69 (diff) | |
download | src-29a0dda797b58108d148e7f25371f892f84205d4.tar.gz |
Merge third_party/opus/src from https://chromium.googlesource.com/chromium/deps/opus.git at 36fa2621472ebf5b859fd16bbdb749019c68cc69
This commit was generated by merge_from_chromium.py.
Change-Id: Iddd0018e3d3bcc14f0ceb6cdb5ddbb570ea92cec
Diffstat (limited to 'silk/float/SigProc_FLP.h')
-rw-r--r-- | silk/float/SigProc_FLP.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/silk/float/SigProc_FLP.h b/silk/float/SigProc_FLP.h index 2f5bb4c..f0cb373 100644 --- a/silk/float/SigProc_FLP.h +++ b/silk/float/SigProc_FLP.h @@ -94,7 +94,8 @@ opus_int silk_pitch_analysis_core_FLP( /* O Voicing estimate: 0 voiced, const silk_float search_thres2, /* I Final threshold for lag candidates 0 - 1 */ const opus_int Fs_kHz, /* I sample frequency (kHz) */ const opus_int complexity, /* I Complexity setting, 0-2, where 2 is highest */ - const opus_int nb_subfr /* I Number of 5 ms subframes */ + const opus_int nb_subfr, /* I Number of 5 ms subframes */ + int arch /* I Run-time architecture */ ); void silk_insertion_sort_decreasing_FLP( @@ -153,19 +154,19 @@ double silk_energy_FLP( #define silk_abs_float( a ) ((silk_float)fabs(a)) /* sigmoid function */ -static inline silk_float silk_sigmoid( silk_float x ) +static OPUS_INLINE silk_float silk_sigmoid( silk_float x ) { return (silk_float)(1.0 / (1.0 + exp(-x))); } /* floating-point to integer conversion (rounding) */ -static inline opus_int32 silk_float2int( silk_float x ) +static OPUS_INLINE opus_int32 silk_float2int( silk_float x ) { return (opus_int32)float2int( x ); } /* floating-point to integer conversion (rounding) */ -static inline void silk_float2short_array( +static OPUS_INLINE void silk_float2short_array( opus_int16 *out, const silk_float *in, opus_int32 length @@ -178,7 +179,7 @@ static inline void silk_float2short_array( } /* integer to floating-point conversion */ -static inline void silk_short2float_array( +static OPUS_INLINE void silk_short2float_array( silk_float *out, const opus_int16 *in, opus_int32 length @@ -191,7 +192,7 @@ static inline void silk_short2float_array( } /* using log2() helps the fixed-point conversion */ -static inline silk_float silk_log2( double x ) +static OPUS_INLINE silk_float silk_log2( double x ) { return ( silk_float )( 3.32192809488736 * log10( x ) ); } |