Commit 54bcf196 authored by JÜRGEN Gerstacker's avatar JÜRGEN Gerstacker
Browse files

FIX_2429 inside post_decoder_ivas_fx(), a special code is called for... 

FIX_2429  inside post_decoder_ivas_fx(), a special code is called for EVS_MONO, using L_SUBFR instead of L_subfr
parent 53911ab3

lib_dec/post_dec_fx.c

+16 −0
Original line number Diff line number Diff line
@@ -236,11 +236,27 @@ void post_decoder_ivas_fx( 
        IF( pfstat_on_previous )

        {

            Copy( st->hPFstat->mem_pf_in + L_SYN_MEM - M, synth - M, M );

#ifdef FIX_2429_POST_DECODER

            IF ( EQ_16( st->element_mode, EVS_MONO ) ) {

                Residu3_fx( st->old_Aq_12_8_fx, synth, synth_buf, L_SUBFR, 1 );

                E_UTIL_synthesis( 1, st->old_Aq_12_8_fx, synth_buf, synth2, L_SUBFR, st->hPFstat->mem_stp + L_SYN_MEM - M, 0, M );

                scale_st_fx( synth, synth2, &st->hPFstat->gain_prec, L_SUBFR );

                blend_subfr2_fx( synth2 + L_SUBFR / 2, synth + L_SUBFR / 2, synth2 + L_SUBFR / 2 );

            }

            ELSE {

                Word16 L_subfr = idiv1616( st->L_frame, st->nb_subfr );

                Residu3_fx( st->old_Aq_12_8_fx, synth, synth_buf, L_subfr, 1 );

                E_UTIL_synthesis( 1, st->old_Aq_12_8_fx, synth_buf, synth2, L_subfr, st->hPFstat->mem_stp + L_SYN_MEM - M, 0, M );

                scale_st_fx( synth, synth2, &st->hPFstat->gain_prec, L_subfr );

                blend_subfr2_fx( synth2 + shr( L_subfr, 1 ), synth + shr( L_subfr, 1 ), synth2 + shr( L_subfr, 1 ) );

            }

#else

            Word16 L_subfr = idiv1616( st->L_frame, st->nb_subfr );

            Residu3_fx( st->old_Aq_12_8_fx, synth, synth_buf, L_subfr, 1 );

            E_UTIL_synthesis( 1, st->old_Aq_12_8_fx, synth_buf, synth2, L_subfr, st->hPFstat->mem_stp + L_SYN_MEM - M, 0, M );

            scale_st_fx( synth, synth2, &st->hPFstat->gain_prec, L_subfr );

            blend_subfr2_fx( synth2 + shr( L_subfr, 1 ), synth + shr( L_subfr, 1 ), synth2 + shr( L_subfr, 1 ) );

#endif

        }

    }

    ELSE