Commit aca651c8 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE

parent 991388df

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_1002_DEC_PHASE_ECU_USAN_OF_PHASE            /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions   */

#define FIX_960_SYN_OUTPUT                              /* VA: issue 960: unused function syn_output() is removed */

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

lib_dec/FEC_HQ_phase_ecu.c

+0 −8
Original line number Diff line number Diff line
@@ -1091,12 +1091,8 @@ static void subst_spec( 
        }



        Xph = corr_phase[m];

#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE

        /* extract fractional phase integer index in the range [0...1023] */

        Xph_short = (int16_t) ( 0x000003ff & (int32_t) ( ( Xph * 512 ) / EVS_PI ) );

#else

        Xph_short = (int16_t) ( ( (int32_t) ( Xph * 512 / EVS_PI ) ) % 32768 ) & 0x03ff;

#endif





        if ( Xph_short >= 512 )
@@ -1142,11 +1138,7 @@ static void subst_spec( 
                    mag_chg_local *= 0.5f + ( 1.0f - ( 1.0f / PHASE_DITH ) * ph_dith ) * 0.5f;

                }



#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE

                Xph_short = (int16_t) ( ( (int32_t) ( ( Xph * 512 ) / EVS_PI ) ) & 0x000003ff );

#else

                Xph_short = (int16_t) ( Xph * 512 / EVS_PI ) & 0x03ff;

#endif



                if ( Xph_short >= 512 )

                {