Commit 84faa8bd authored by Arash Azizi's avatar Arash Azizi
Browse files

Issue 2568: fixing switch and fixing the issue

parent ff938b8a

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_BASOP_2560_STEREO_DFT_DEC_RESET             /* FhG: BASOP issue 2560: align reset of hStereoDft->res_gains_ind_fx[][] between BASOP and float */

#define HARMONIZE_2539_cng_energy                       /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */

#define FIX_ISSUE_2568_ADAPR_GR_RPG1                    /* FhG: basop issue 2568: Missing comparison macros in function adapt_GR_rpg1_ief_fx()*/

#define FIX_ISSUE_2568_ADAPT_GR_RPG1                    /* FhG: basop issue 2568: Missing comparison macros in function adapt_GR_rpg1_ief_fx()*/



/* #################### End BE switches ################################## */

lib_enc/ivas_stereo_adapt_GR_enc_fx.c

+10 −2
Original line number Diff line number Diff line
@@ -225,7 +225,11 @@ Word16 adapt_GR_rpg1_ief_fx( 


    map0 = &maps[8 * NO_SYMB_GR_PRED_G];



#ifndef FIX_ISSUE_2568_ADAPT_GR_RPG1

    IF(in[0] == 0)

#else

    IF(EQ_16(in[0], 0))

#endif // !FIX_ISSUE_2568_ADAPT_GR_RPG1

    {

        s = 0;

        move16();
@@ -234,7 +238,11 @@ Word16 adapt_GR_rpg1_ief_fx( 
            s = add( s, in[i] );

        }



#ifndef FIX_ISSUE_2568_ADAPT_GR_RPG1

        IF(s == 0)

#else

        IF(EQ_16(s, 0))

#endif // !FIX_ISSUE_2568_ADAPT_GR_RPG1

        {

            /* encode only the first zero with GR1 */

            *nbits = add( shr( map0[0], 1 ), 2 );