diff options
| author | Koen Vos <koen.vos@skype.net> | 2011-10-29 03:44:26 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2011-10-29 03:44:26 +0400 |
| commit | acc7a6c78b266e3ef0e1f91ee405af92a0989dec (patch) | |
| tree | d3e32cc66cf96fecdaffc924ff0d051028b72f31 /silk/process_NLSFs.c | |
| parent | 2d4f61409186c7efa831387bf14e2164607a805a (diff) | |
Reformatting changes with an update to the MSVC project files
Diffstat (limited to 'silk/process_NLSFs.c')
| -rw-r--r-- | silk/process_NLSFs.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/silk/process_NLSFs.c b/silk/process_NLSFs.c index 6e1cc06f..c49f884f 100644 --- a/silk/process_NLSFs.c +++ b/silk/process_NLSFs.c @@ -33,10 +33,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* Limit, stabilize, convert and quantize NLSFs */ void silk_process_NLSFs( - silk_encoder_state *psEncC, /* I/O Encoder state */ - opus_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ], /* O Prediction coefficients */ - opus_int16 pNLSF_Q15[ MAX_LPC_ORDER ], /* I/O Normalized LSFs (quant out) (0 - (2^15-1)) */ - const opus_int16 prev_NLSFq_Q15[ MAX_LPC_ORDER ] /* I Previous Normalized LSFs (0 - (2^15-1)) */ + silk_encoder_state *psEncC, /* I/O Encoder state */ + opus_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ], /* O Prediction coefficients */ + opus_int16 pNLSF_Q15[ MAX_LPC_ORDER ], /* I/O Normalized LSFs (quant out) (0 - (2^15-1)) */ + const opus_int16 prev_NLSFq_Q15[ MAX_LPC_ORDER ] /* I Previous Normalized LSFs (0 - (2^15-1)) */ ) { opus_int i, doInterpolate; @@ -80,15 +80,12 @@ void silk_process_NLSFs( i_sqr_Q15 = silk_LSHIFT( silk_SMULBB( psEncC->indices.NLSFInterpCoef_Q2, psEncC->indices.NLSFInterpCoef_Q2 ), 11 ); for( i = 0; i < psEncC->predictLPCOrder; i++ ) { pNLSFW_QW[ i ] = silk_SMLAWB( silk_RSHIFT( pNLSFW_QW[ i ], 1 ), pNLSFW0_temp_QW[ i ], i_sqr_Q15 ); - silk_assert( pNLSFW_QW[ i ] <= silk_int16_MAX ); silk_assert( pNLSFW_QW[ i ] >= 1 ); } } - TIC(NLSF_encode) silk_NLSF_encode( psEncC->indices.NLSFIndices, pNLSF_Q15, psEncC->psNLSF_CB, pNLSFW_QW, NLSF_mu_Q20, psEncC->NLSF_MSVQ_Survivors, psEncC->indices.signalType ); - TOC(NLSF_encode) /* Convert quantized NLSFs back to LPC coefficients */ silk_NLSF2A( PredCoef_Q12[ 1 ], pNLSF_Q15, psEncC->predictLPCOrder ); |