Commit b5e8981f authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 2247-accelerate-basop_util_addmant32exp
parents 17914e21 f41cbecf

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 


#define FIX_1454_FIX_STEREO_TO_FOA_JBM                  /* VA: issue 1454: fix buggy stereo to FOA in JBM */

#define FIX_2015_PREMPH_SAT_ALT_PART2                   /* VA: Add missing scaling factor to be passed to AVQ_cod() */

#define FIX_2253_CORRECT_GSC_MINIMUM_PIT_SEARCH         /* VA: Fix Issue 2253 where the encoder and decoder could get out of sync */

lib_enc/eval_pit_contr_fx.c

+7 −2
Original line number Diff line number Diff line
@@ -422,7 +422,9 @@ Word16 Pit_exc_contribution_len_ivas_fx( /* o : bin wher 
                                         const Word16 *dct_res, /* i  : DCT of residual                                 Q_new*/

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

                                         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*/

#endif

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

                                         Word16 Qnew )

{
@@ -455,8 +457,11 @@ Word16 Pit_exc_contribution_len_ivas_fx( /* o : bin wher 
        Mbands_loc = MBANDS_LOC;

        move16();

    }



#ifndef FIX_2253_CORRECT_GSC_MINIMUM_PIT_SEARCH

    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 );

    tmp = shl( low_pit, exp1 );

    tmp_dec = 12800;

lib_enc/gs_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -675,7 +675,11 @@ void encod_audio_ivas_fx( 
     * 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_ivas_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_ivas_fx( st_fx, dct_res, dct_epit, pitch_buf, &hGSCEnc->pit_exc_hangover, Q_new );

#endif



    IF( last_pit_bin == 0 )

    {

lib_enc/prot_fx_enc.h

+3 −1
Original line number Diff line number Diff line
@@ -4039,7 +4039,9 @@ Word16 Pit_exc_contribution_len_ivas_fx( 
    const Word16 *dct_res, /* i  : DCT of residual                 Qnew*/

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

    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*/

#endif

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

    Word16 Qnew );