Commit 1df9e4c3 authored by multrus's avatar multrus
Browse files

Merge branch '20240320_cleanup' into 'main' 

[cleanup] accept FIX_1027_GSC_INT_OVERFLOW

See merge request !1468
parents 54f2f9de bc2aaabf

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_1027_GSC_INT_OVERFLOW                       /* VA: issue 2207: overflow in GSC */

#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT              /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */

#define FIX_1023_REMOVE_PARAMMC_DEC                     /* VA: issue 1023: remove unused function ivas_param_mc_dec() */

#define FIX_1022_REMOVE_PARAMISM_DEC                    /* VA: issue 1022: remove unused function ivas_param_ism_dec() */

lib_dec/gs_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -643,11 +643,7 @@ void gsc_dec( 
                }

                if ( concat_out[j] < 0 )

                {

#ifdef FIX_1027_GSC_INT_OVERFLOW

                    seed_init = (int16_t) ( (int32_t) seed_init + 3 );

#else

                    seed_init += 3;

#endif

                }

            }

lib_enc/gs_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -545,11 +545,7 @@ void gsc_enc( 
            }

            if ( concat_out[j] < 0 )

            {

#ifdef FIX_1027_GSC_INT_OVERFLOW

                seed_init = (int16_t) ( (int32_t) seed_init + 3 );

#else

                seed_init += 3;

#endif

            }

        }