Skip to content
Snippets Groups Projects
Commit eb2c8f38 authored by Koen Vos's avatar Koen Vos Committed by Jean-Marc Valin
Browse files

NLSF_del_dec_quant minor clean up

parent c462ae92
No related branches found
No related tags found
No related merge requests found
...@@ -84,7 +84,7 @@ opus_int32 silk_NLSF_del_dec_quant( /* O Returns ...@@ -84,7 +84,7 @@ opus_int32 silk_NLSF_del_dec_quant( /* O Returns
nStates = 1; nStates = 1;
RD_Q25[ 0 ] = 0; RD_Q25[ 0 ] = 0;
prev_out_Q10[ 0 ] = 0; prev_out_Q10[ 0 ] = 0;
for( i = order - 1; ; i-- ) { for( i = order - 1; i >= 0; i-- ) {
rates_Q5 = &ec_rates_Q5[ ec_ix[ i ] ]; rates_Q5 = &ec_rates_Q5[ ec_ix[ i ] ];
in_Q10 = x_Q10[ i ]; in_Q10 = x_Q10[ i ];
for( j = 0; j < nStates; j++ ) { for( j = 0; j < nStates; j++ ) {
...@@ -131,7 +131,7 @@ opus_int32 silk_NLSF_del_dec_quant( /* O Returns ...@@ -131,7 +131,7 @@ opus_int32 silk_NLSF_del_dec_quant( /* O Returns
RD_Q25[ j + nStates ] = silk_SMLABB( silk_MLA( RD_tmp_Q25, silk_SMULBB( diff_Q10, diff_Q10 ), w_Q5[ i ] ), mu_Q20, rate1_Q5 ); RD_Q25[ j + nStates ] = silk_SMLABB( silk_MLA( RD_tmp_Q25, silk_SMULBB( diff_Q10, diff_Q10 ), w_Q5[ i ] ), mu_Q20, rate1_Q5 );
} }
if( nStates <= ( NLSF_QUANT_DEL_DEC_STATES >> 1 ) ) { if( nStates < NLSF_QUANT_DEL_DEC_STATES ) {
/* double number of states and copy */ /* double number of states and copy */
for( j = 0; j < nStates; j++ ) { for( j = 0; j < nStates; j++ ) {
ind[ j + nStates ][ i ] = ind[ j ][ i ] + 1; ind[ j + nStates ][ i ] = ind[ j ][ i ] + 1;
...@@ -140,7 +140,7 @@ opus_int32 silk_NLSF_del_dec_quant( /* O Returns ...@@ -140,7 +140,7 @@ opus_int32 silk_NLSF_del_dec_quant( /* O Returns
for( j = nStates; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) { for( j = nStates; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) {
ind[ j ][ i ] = ind[ j - nStates ][ i ]; ind[ j ][ i ] = ind[ j - nStates ][ i ];
} }
} else if( i > 0 ) { } else {
/* sort lower and upper half of RD_Q25, pairwise */ /* sort lower and upper half of RD_Q25, pairwise */
for( j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) { for( j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) {
if( RD_Q25[ j ] > RD_Q25[ j + NLSF_QUANT_DEL_DEC_STATES ] ) { if( RD_Q25[ j ] > RD_Q25[ j + NLSF_QUANT_DEL_DEC_STATES ] ) {
...@@ -191,8 +191,6 @@ opus_int32 silk_NLSF_del_dec_quant( /* O Returns ...@@ -191,8 +191,6 @@ opus_int32 silk_NLSF_del_dec_quant( /* O Returns
for( j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) { for( j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) {
ind[ j ][ i ] += silk_RSHIFT( ind_sort[ j ], NLSF_QUANT_DEL_DEC_STATES_LOG2 ); ind[ j ][ i ] += silk_RSHIFT( ind_sort[ j ], NLSF_QUANT_DEL_DEC_STATES_LOG2 );
} }
} else { /* i == 0 */
break;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment