Commit e8fa2b88 authored by vaclav's avatar vaclav
Browse files

fix

parent 58264829

lib_dec/acelp_core_dec_fx.c

+14 −3
Original line number Diff line number Diff line
@@ -712,9 +712,20 @@ ivas_error acelp_core_dec_fx( 
            test();

            IF( st_fx->hMusicPF && st_fx->hGSCDec )

            {

#ifdef REMOVE_EVS_DUPLICATES2

                IF( EQ_16( st_fx->element_mode, EVS_MONO ) )

                {

                    // VE: TBV: 'st_fx->L_frame * HIBND_ACB_L_FAC' should be corrected

                    Rescale_exc( hMusicPF->dct_post_old_exc_fx, exc_fx, bwe_exc_fx, st_fx->hGSCDec->last_exc_dct_in_fx, st_fx->L_frame,

                                 st_fx->L_frame * HIBND_ACB_L_FAC, 0, &( st_fx->Q_exc ), st_fx->Q_subfr, NULL, 0, INACTIVE );

                }

                ELSE

#endif

                {

                    Rescale_exc( st_fx->hMusicPF->dct_post_old_exc_fx, exc_fx, bwe_exc_fx, st_fx->hGSCDec->last_exc_dct_in_fx, st_fx->L_frame,

                                 imult1616( st_fx->L_frame, HIBND_ACB_L_FAC ), 0, &( st_fx->Q_exc ), st_fx->Q_subfr, NULL, 0, INACTIVE );

                }

            }

            IF( st_fx->hPFstat != NULL )

            {

                Rescale_mem( st_fx->Q_exc, &st_fx->prev_Q_syn, &st_fx->Q_syn, st_fx->mem_syn2_fx, st_fx->mem_syn_clas_estim_fx, delta_mem_scale,
@@ -2043,7 +2054,7 @@ ivas_error acelp_core_dec_fx( 
        {

            hf_synth_reset_fx( st_fx->hBWE_zero );

#ifdef MSAN_FIX

            IF( NE_16( st_fx->element_mode, EVS_MONO ) ) // TBV: tmp hack - it is a bug in EVS but conditon is here to keep EVS bit-exact

            IF( NE_16( st_fx->element_mode, EVS_MONO ) ) // VE: TBV: tmp hack - it is a bug in EVS but conditon is here to keep EVS bit-exact

            {

                set16_fx( st_fx->hBWE_zero->mem_hp400_fx, 0, 6 );

            }