Commit 74804cd9 authored by vaillancour's avatar vaillancour Committed by Manuel Jander
Browse files

harmonize IVAS and EVS code

parent fc665c01

lib_enc/eval_pit_contr_fx.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -55,7 +55,9 @@ Word16 Pit_exc_contribution_len_fx( 
    const Word16 *dct_res, /* i  : DCT of residual                 Qnew*/

    const Word16 *dct_res, /* i  : DCT of residual                 Qnew*/

    Word16 *dct_pitex,     /* i/o: DCT of pitch contribution       Qnew*/

    Word16 *dct_pitex,     /* i/o: DCT of pitch contribution       Qnew*/

    Word16 *pitch_buf,     /* i/o: Pitch per subframe              Q6*/

    Word16 *pitch_buf,     /* i/o: Pitch per subframe              Q6*/

#ifndef FIX_2253_CORRECT_GSC_MINIMUM_PIT_SEARCH

    const Word16 nb_subfr, /* i  : Number of subframe considered   Q0*/

    const Word16 nb_subfr, /* i  : Number of subframe considered   Q0*/

#endif

    Word16 *hangover,      /* i  : hangover for the time contribution switching        Q0*/

    Word16 *hangover,      /* i  : hangover for the time contribution switching        Q0*/

    Word16 Qnew )

    Word16 Qnew )

{

{
@@ -89,7 +91,11 @@ Word16 Pit_exc_contribution_len_fx( 
        move16();

        move16();

    }

    }





#ifndef FIX_2253_CORRECT_GSC_MINIMUM_PIT_SEARCH

    minimum_fx( pitch_buf, nb_subfr, &low_pit );

    minimum_fx( pitch_buf, nb_subfr, &low_pit );

#else

    minimum_fx( pitch_buf, shr( st_fx->L_frame, 6 ), &low_pit );

#endif

    exp1 = norm_s( low_pit );

    exp1 = norm_s( low_pit );

    tmp = shl( low_pit, exp1 );

    tmp = shl( low_pit, exp1 );

    tmp_dec = 12800;

    tmp_dec = 12800;

lib_enc/gs_enc_fx.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -304,7 +304,11 @@ void encod_audio_fx( 
     * Find and encode the last band where the adaptive (pitch) contribution is significant

     * Find and encode the last band where the adaptive (pitch) contribution is significant

     *---------------------------------------------------------------*/

     *---------------------------------------------------------------*/





#ifndef FIX_2253_CORRECT_GSC_MINIMUM_PIT_SEARCH

    last_pit_bin = Pit_exc_contribution_len_fx( st_fx, dct_res, dct_epit, pitch_buf, nb_subfr, &hGSCEnc->pit_exc_hangover, Q_new );

    last_pit_bin = Pit_exc_contribution_len_fx( st_fx, dct_res, dct_epit, pitch_buf, nb_subfr, &hGSCEnc->pit_exc_hangover, Q_new );

#else

    last_pit_bin = Pit_exc_contribution_len_fx( st_fx, dct_res, dct_epit, pitch_buf, &hGSCEnc->pit_exc_hangover, Q_new );

#endif





    IF( last_pit_bin == 0 )

    IF( last_pit_bin == 0 )

    {

    {

lib_enc/prot_fx_enc.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -4039,7 +4039,9 @@ Word16 Pit_exc_contribution_len_fx( 
    Encoder_State *st_fx,  /* i/o: state structure                                  */

    Encoder_State *st_fx,  /* i/o: state structure                                  */

    const Word16 *dct_res, /* i  : DCT of residual                                  Qnew*/

    const Word16 *dct_res, /* i  : DCT of residual                                  Qnew*/

    Word16 *dct_pitex,     /* i/o: DCT of pitch contribution                        Qnew*/

    Word16 *dct_pitex,     /* i/o: DCT of pitch contribution                        Qnew*/

#ifndef FIX_2253_CORRECT_GSC_MINIMUM_PIT_SEARCH

    Word16 *pitch_buf,     /* i/o: Pitch per subframe                               Q6*/

    Word16 *pitch_buf,     /* i/o: Pitch per subframe                               Q6*/

#endif

    const Word16 nb_subfr, /* i  : Number of subframe considered                    Q0*/

    const Word16 nb_subfr, /* i  : Number of subframe considered                    Q0*/

    Word16 *hangover,      /* i  : hangover for the time contribution switching     Q0*/

    Word16 *hangover,      /* i  : hangover for the time contribution switching     Q0*/

    Word16 Qnew );

    Word16 Qnew );