Commit 04c0ba5c authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1179_USAN_PHASEECU

parent 964309a3

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1179_USAN_PHASEECU                          /* Eri: issue 1179:  better handling of 16 bit wrap around for very long(>200ms) FER-bursts   */

#define FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX          /* VA: issue 1249: remove obsolete code around ALLRAD decoder matrix */

#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE             /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */

lib_dec/FEC_HQ_phase_ecu.c

+0 −27
Original line number Diff line number Diff line
@@ -2089,28 +2089,16 @@ static void hq_phase_ecu( 


    if ( !prev_bfi || ( prev_bfi && *last_fec && ( *time_offs == output_frame ) ) )

    {

#ifdef FIX_1179_USAN_PHASEECU

        if ( !( prev_bfi && *last_fec && ( element_mode == EVS_MONO ) ) )

        {

            *time_offs = 0; /* IVAS reset of offset time counter, timeoffset variable later also used to calculate burst length */

        }

#else

        if ( prev_bfi && *last_fec && element_mode == EVS_MONO )

        {

            *time_offs += 0;

        }

        else

        {

            *time_offs = 0;

        }

#endif



        trans_ana( prevsynth + 2 * output_frame - Lprot - *time_offs + ph_ecu_lookahead, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab, *last_fec, alpha, beta, beta_mute, Xavg );

        spec_ana( prevsynth + 2 * output_frame - Lprot - *time_offs + ph_ecu_lookahead, plocs, plocsi, num_p, X_sav, output_frame, bwidth, element_mode, &noise_fac, pcorr );



        if ( prev_bfi && *last_fec )

        {

#ifdef FIX_1179_USAN_PHASEECU

            if ( element_mode != EVS_MONO )

            {

                *time_offs = (int16_t) ( *time_offs + output_frame ); /* USAN avoid risk of internal int32_t  in "+="  */
@@ -2123,26 +2111,15 @@ static void hq_phase_ecu( 
            {

                *time_offs = (int16_t) ( *time_offs + output_frame ); /* EVS_MONO BE compatible, but EVS CR needed as wrap will cause burst length muting envelope instability issues */

            }

#else

            *time_offs += output_frame;

#endif

        }

    }

    else

    {

#ifdef FIX_1179_USAN_PHASEECU

        *time_offs = (int16_t) ( *time_offs + output_frame ); /* cast added for USAN, "+=" avoided as it may creat a truncation from int to int16_t  */

#else

        *time_offs += output_frame;

#endif

        if ( *time_offs <= 0 )

        {

            /* detect wrap around  of st->time_offs */

#ifdef FIX_1179_USAN_PHASEECU

            *time_offs = (int16_t) INT16_MAX; /* high value --> continued muting will ensure that the now saturated  seed is not creating tones */

#else

            *time_offs = MAX16B;

#endif

        }



        trans_ana( prevsynth + 2 * output_frame - Lprot, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab, 0, alpha, beta, beta_mute, Xavg ); /* 1.0 stable-music,  0.0 speech-like */
@@ -2154,11 +2131,7 @@ static void hq_phase_ecu( 
    seed = *time_offs;

    if ( *num_p > 0 )

    {

#ifdef FIX_1179_USAN_PHASEECU

        seed = (int16_t) ( seed + plocs[*num_p - 1] ); /* explicit cast and "+="  not used,  as it "+="  may create a cast from 32 bit to 16 bit, triggering USAN   */

#else

        seed += plocs[*num_p - 1];

#endif

    }



    subst_spec( plocs, plocsi, num_p, *time_offs, X, mag_chg, ph_dith, old_is_transient, output_frame, &seed, alpha, beta, *beta_mute, Xavg, element_mode, ph_ecu_lookahead, noise_fac );