| Index: silk/SigProc_FIX.h
|
| diff --git a/silk/SigProc_FIX.h b/silk/SigProc_FIX.h
|
| index daa5fd043e865eca2ce21c156ce646e4a4a43787..3344ddb84e2b03b760cce785c9361d8b20f62a61 100644
|
| --- a/silk/SigProc_FIX.h
|
| +++ b/silk/SigProc_FIX.h
|
| @@ -8,11 +8,11 @@ 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.
|
| -- Neither the name of Internet Society, IETF or IETF Trust, nor the
|
| +- Neither the name of Internet Society, IETF or IETF Trust, nor the
|
| names of specific contributors, may be used to endorse or promote
|
| products derived from this software without specific prior written
|
| permission.
|
| -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”
|
| +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
| AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
| ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
| @@ -168,12 +168,6 @@ opus_int32 silk_log2lin(
|
| const opus_int32 inLog_Q7 /* I input on log scale */
|
| );
|
|
|
| -/* Function that returns the maximum absolut value of the input vector */
|
| -opus_int16 silk_int16_array_maxabs( /* O Maximum absolute value, max: 2^15-1 */
|
| - const opus_int16 *vec, /* I Input vector [len] */
|
| - const opus_int32 len /* I Length of input vector */
|
| -);
|
| -
|
| /* Compute number of bits to right shift the sum of squares of a vector */
|
| /* of int16s to make it fit in an int32 */
|
| void silk_sum_sqr_shift(
|
| @@ -252,7 +246,7 @@ opus_int silk_pitch_analysis_core( /* O Voicing estimate: 0
|
| opus_int *LTPCorr_Q15, /* I/O Normalized correlation; input: value from previous frame */
|
| opus_int prevLag, /* I Last lag of previous frame; set to zero is unvoiced */
|
| const opus_int32 search_thres1_Q16, /* I First stage threshold for lag candidates 0 - 1 */
|
| - const opus_int search_thres2_Q15, /* I Final threshold for lag candidates 0 - 1 */
|
| + const opus_int search_thres2_Q13, /* 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 */
|
| @@ -582,6 +576,14 @@ static inline opus_int64 silk_max_64(opus_int64 a, opus_int64 b)
|
| #include "MacroCount.h"
|
| #include "MacroDebug.h"
|
|
|
| +#ifdef ARMv4_ASM
|
| +#include "arm/SigProc_FIX_armv4.h"
|
| +#endif
|
| +
|
| +#ifdef ARMv5E_ASM
|
| +#include "arm/SigProc_FIX_armv5e.h"
|
| +#endif
|
| +
|
| #ifdef __cplusplus
|
| }
|
| #endif
|
|
|