diff options
Diffstat (limited to 'silk/silk_LPC_analysis_filter.c')
| -rw-r--r-- | silk/silk_LPC_analysis_filter.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/silk/silk_LPC_analysis_filter.c b/silk/silk_LPC_analysis_filter.c index 2a4b8e01..7859d735 100644 --- a/silk/silk_LPC_analysis_filter.c +++ b/silk/silk_LPC_analysis_filter.c @@ -50,34 +50,34 @@ void silk_LPC_analysis_filter( opus_int32 out32_Q12, out32; const opus_int16 *in_ptr; - SKP_assert( d >= 6 ); - SKP_assert( (d & 1) == 0 ); - SKP_assert( d <= len ); + silk_assert( d >= 6 ); + silk_assert( (d & 1) == 0 ); + silk_assert( d <= len ); for ( ix = d; ix < len; ix++) { in_ptr = &in[ ix - 1 ]; - out32_Q12 = SKP_SMULBB( in_ptr[ 0 ], B[ 0 ] ); - out32_Q12 = SKP_SMLABB( out32_Q12, in_ptr[ -1 ], B[ 1 ] ); - out32_Q12 = SKP_SMLABB( out32_Q12, in_ptr[ -2 ], B[ 2 ] ); - out32_Q12 = SKP_SMLABB( out32_Q12, in_ptr[ -3 ], B[ 3 ] ); - out32_Q12 = SKP_SMLABB( out32_Q12, in_ptr[ -4 ], B[ 4 ] ); - out32_Q12 = SKP_SMLABB( out32_Q12, in_ptr[ -5 ], B[ 5 ] ); + out32_Q12 = silk_SMULBB( in_ptr[ 0 ], B[ 0 ] ); + out32_Q12 = silk_SMLABB( out32_Q12, in_ptr[ -1 ], B[ 1 ] ); + out32_Q12 = silk_SMLABB( out32_Q12, in_ptr[ -2 ], B[ 2 ] ); + out32_Q12 = silk_SMLABB( out32_Q12, in_ptr[ -3 ], B[ 3 ] ); + out32_Q12 = silk_SMLABB( out32_Q12, in_ptr[ -4 ], B[ 4 ] ); + out32_Q12 = silk_SMLABB( out32_Q12, in_ptr[ -5 ], B[ 5 ] ); for( j = 6; j < d; j += 2 ) { - out32_Q12 = SKP_SMLABB( out32_Q12, in_ptr[ -j ], B[ j ] ); - out32_Q12 = SKP_SMLABB( out32_Q12, in_ptr[ -j - 1 ], B[ j + 1 ] ); + out32_Q12 = silk_SMLABB( out32_Q12, in_ptr[ -j ], B[ j ] ); + out32_Q12 = silk_SMLABB( out32_Q12, in_ptr[ -j - 1 ], B[ j + 1 ] ); } /* Subtract prediction */ - out32_Q12 = SKP_SUB32( SKP_LSHIFT( (opus_int32)in_ptr[ 1 ], 12 ), out32_Q12 ); + out32_Q12 = silk_SUB32( silk_LSHIFT( (opus_int32)in_ptr[ 1 ], 12 ), out32_Q12 ); /* Scale to Q0 */ - out32 = SKP_RSHIFT_ROUND( out32_Q12, 12 ); + out32 = silk_RSHIFT_ROUND( out32_Q12, 12 ); /* Saturate output */ - out[ ix ] = ( opus_int16 )SKP_SAT16( out32 ); + out[ ix ] = ( opus_int16 )silk_SAT16( out32 ); } /* Set first d output samples to zero */ - SKP_memset( out, 0, d * sizeof( opus_int16 ) ); + silk_memset( out, 0, d * sizeof( opus_int16 ) ); } |