Commit 61609e32 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict

parent 624d8dd9

lib_enc/ivas_core_pre_proc_front_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -614,11 +614,19 @@ ivas_error pre_proc_front_ivas_fx( 
    }

    ELSE IF( EQ_16( element_mode, IVAS_CPE_TD ) || EQ_16( element_mode, IVAS_CPE_MDCT ) )

    {

#ifdef NONBE_FIX_ISSUE_2206

        Copy_Scale_sig( new_inp_12k8_fx - lMemRecalc_12k8, st->buf_speech_enc + L_FRAME32k - lMemRecalc_12k8 - L_FILT, add( L_FRAME + L_FILT, lMemRecalc_12k8 ), sub( st->q_inp, st->q_inp ) ); /* Q_inp_const */

#else

        Copy_Scale_sig( new_inp_12k8_fx - lMemRecalc_12k8, st->buf_speech_enc + L_FRAME32k - lMemRecalc_12k8 - L_FILT, add( L_FRAME + L_FILT, lMemRecalc_12k8 ), sub( Q_inp_const, st->q_inp ) ); /* Q_inp_const */

#endif

    }

    ELSE

    {

#ifdef NONBE_FIX_ISSUE_2206

        Copy_Scale_sig( new_inp_12k8_fx, st->buf_speech_enc + L_FRAME32k, L_FRAME, sub( st->q_inp, st->q_inp ) ); /* Q_inp_const */

#else

        Copy_Scale_sig( new_inp_12k8_fx, st->buf_speech_enc + L_FRAME32k, L_FRAME, sub( Q_inp_const, st->q_inp ) ); /* Q_inp_const */

#endif

    }

#endif

lib_enc/ivas_cpe_enc_fx.c

+5 −1
Original line number Diff line number Diff line
@@ -940,7 +940,11 @@ ivas_error ivas_cpe_enc_fx( 
            Copy_Scale_sig_32_16( old_inp_12k8_fx[1] + L_FRAME8k, sts[1]->old_inp_12k8_fx, L_INP_MEM, 0 - 15 ); // Q0

            sts[1]->exp_old_inp_12k8 = Q15;

            move16();

#ifdef NONBE_FIX_ISSUE_2206

            Copy_Scale_sig_32_16( old_inp_12k8_fx[1], old_inp_12k8_16fx[1], L_INP_12k8, sub( sts[0]->q_inp, Q15 ) ); // sts[0]->q_inp32

#else

            Copy_Scale_sig_32_16( old_inp_12k8_fx[1], old_inp_12k8_16fx[1], L_INP_12k8, -Q16 ); // Q-1

#endif

        }



        /* no iDFT at input sampling rate for Side channel -> reset the buffer */