Commit 9e7855a4 authored by vaclav's avatar vaclav
Browse files

fix within FIX_1320_STACK_CPE_DECODER

parent 8d974424

lib_dec/ivas_mdct_core_dec_fx.c

+9 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,11 @@ void ivas_mdct_core_reconstruct_fx( 


            // norm(synth_buf) >= q_syn - q_win

            // norm(synth_buf) + q_win >= q_syn

#ifdef FIX_1320_STACK_CPE_DECODER

            sf = s_min( getScaleFactor16( synth_buf_fx, add( add( st->hTcxDec->old_synth_len, L_FRAME_PLUS_INTERNAL ), M ) ), getScaleFactor16( synth_bufFB_fx, add( add( st->hTcxDec->old_synth_lenFB, L_FRAME_PLUS ), M ) ) );

#else

            sf = s_min( getScaleFactor16( synth_buf_fx, add( add( st->hTcxDec->old_synth_len, L_FRAME_PLUS ), M ) ), getScaleFactor16( synth_bufFB_fx, add( add( st->hTcxDec->old_synth_lenFB, L_FRAME_PLUS ), M ) ) );

#endif

            q_syn = add( sub( sf, 1 ), s_min( q_win, q_winFB ) );

            st->Q_syn = q_syn;

            move16();
@@ -1278,7 +1282,11 @@ void ivas_mdct_core_reconstruct_fx( 
            sf = s_min( getScaleFactor16( st->hHQ_core->old_out_fx, L_FRAME48k ), getScaleFactor16( st->hHQ_core->old_out_LB_fx, L_FRAME32k ) );

            st->Q_syn = add( sf, s_min( q_win, q_winFB ) );



#ifdef FIX_1320_STACK_CPE_DECODER

            Scale_sig( synth_buf_fx, add( add( st->hTcxDec->old_synth_len, L_FRAME_PLUS_INTERNAL ), M ), sub( q_syn, q_win ) ); // st->hTcxDec->q_old_synth -> q_syn

#else

            Scale_sig( synth_buf_fx, add( add( st->hTcxDec->old_synth_len, L_FRAME_PLUS ), M ), sub( q_syn, q_win ) ); // st->hTcxDec->q_old_synth -> q_syn

#endif

            Scale_sig( synth_bufFB_fx, add( add( st->hTcxDec->old_synth_lenFB, L_FRAME_PLUS ), M ), sub( q_syn, q_winFB ) ); // st->hTcxDec->q_old_synth -> q_syn

            // Scale_sig( st->syn, M + 1, add( st->Q_syn, 2 ) );

            Scale_sig( st->syn, M + 1, sub( st->Q_syn, q_win ) );