Commit 584d76c9 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_969_USAN_IGF_ARITH

parent 01eeafdd

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,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_969_USAN_IGF_ARITH                          /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */

#define FIX_959_MASA_LINEAR_REND                        /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */

#define FIX_963_USAN_ERROR                              /* Eri: Issue 963: USAN error in Stereo CNG, division by zero */

#define FIX_971_LOG2_IDX_GAIN_0                         /* VA: prevent -Inf due to log2(ratio==0) */

lib_dec/igf_scf_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -211,12 +211,8 @@ static void decode_sfe_vector( 
       |    c b

       |      e  --> t

    */

#ifdef FIX_969_USAN_IGF_ARITH

    int16_t pred;

    uint16_t pred_tmp;

#else

    uint16_t pred;

#endif

    int16_t f, ctx, ctx_f, ctx_t;



    for ( f = 0; f < length; f++ )
@@ -226,12 +222,8 @@ static void decode_sfe_vector( 
            if ( f == 0 )

            {

                /* decode one of the IGF_SYMBOLS_IN_TABLE == 27 alphabet symbols using the new raw AC function */

#ifdef FIX_969_USAN_IGF_ARITH

                ari_decode_14bits_s27_ext( st, &pred_tmp, &hPrivateData->acState, hPrivateData->cf_se00 );

                pred = (int16_t) pred_tmp;

#else

                ari_decode_14bits_s27_ext( st, &pred, &hPrivateData->acState, hPrivateData->cf_se00 );

#endif

                x[f] = pred << 2;

                x[f] += arith_decode_bits( &hPrivateData->acState, st, 2 ); /* LSBs as 2 bit raw */

            }