Commit c30dab52 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_2556_ALIGN_CONDITIONS

parent 8c599638

lib_com/options.h

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


#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */

#define FIX_2556_ALIGN_CONDITIONS                       /* VA: Fix different conditions that were not exact between float and fix, BE on self-test */

#define FIX_2585_BIT_ALLOCATION_DIFF                    /* VA : issue 2585, bit allocation different behaviors between float and fixed-point for corner cases */

#define FIX_NONBE_2579_INCORRECT_LAG_CALCULATION        /* Dolby: fix 2579: Incorrect lag calculation */

lib_dec/FEC_scale_syn_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -265,11 +265,7 @@ void FEC_scale_syn_fx( 
                        ener_max = *lp_ener_FEC_max; /*Q0*/

                        move32();

                        test();

#ifdef FIX_2556_ALIGN_CONDITIONS

                        if ( ( LE_16( clas, VOICED_TRANSITION ) && element_mode > EVS_MONO ) || EQ_16( clas, VOICED_TRANSITION ) || ( GE_16( clas, INACTIVE_CLAS ) ) )

#else

                        if ( EQ_16( clas, VOICED_TRANSITION ) || ( GE_16( clas, INACTIVE_CLAS ) ) )

#endif

                        {

                            ener_max = *lp_ener_FEC_av; /*Q0*/

                            move32();

lib_dec/core_switching_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1838,11 +1838,7 @@ ivas_error core_switching_pre_dec_fx( 
    {

        hHQ_core->pastpre = sub( hHQ_core->pastpre, 1 );

        move16();

#ifdef FIX_2556_ALIGN_CONDITIONS

        IF( hHQ_core->pastpre <= 0 )

#else

        IF( hHQ_core->pastpre < 0 )

#endif

        {

            reset_preecho_dec_fx( hHQ_core );

        }

lib_dec/dec_uv_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -182,9 +182,7 @@ void decod_unvoiced_fx( 
        }

        voice_factors_fx[tmp_idx] = 0;

        move16();

#ifdef FIX_2556_ALIGN_CONDITIONS

        IF( st_fx->hBWE_TD != NULL )

#endif

        {

            interp_code_5over2_fx( &exc_fx[i_subfr_fx], &bwe_exc_fx[( ( i_subfr_fx * 2 * HIBND_ACB_L_FAC ) >> 1 )], L_SUBFR );

        }

lib_enc/ivas_stereo_td_analysis_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -242,11 +242,7 @@ Word16 stereo_tdm_ener_analysis_fx( 
    {

        test();

        test();

#ifdef FIX_2556_ALIGN_CONDITIONS

        if ( ( EQ_16( hCPE->hStereoClassif->lrtd_mode, 1 ) || EQ_16( hCPE->hStereoTD->prev_fr_LRTD_TD_dec, 1 ) ) && ( LT_32( L_add( L_sub( hCPE->element_brate, 50 * FRAMES_PER_SEC ), L_add( hCPE->brate_surplus, hCPE->brate_surplus ) ), IVAS_BRATE_OMASA_STEREO_SW_THR ) ) )

#else

        if ( ( EQ_16( hCPE->hStereoClassif->lrtd_mode, 1 ) || EQ_16( hCPE->hStereoTD->prev_fr_LRTD_TD_dec, 1 ) ) && ( LE_32( L_add( L_sub( hCPE->element_brate, 50 * FRAMES_PER_SEC ), L_add( hCPE->brate_surplus, hCPE->brate_surplus ) ), IVAS_BRATE_OMASA_STEREO_SW_THR ) ) )

#endif

        {

            hStereoTD->prev_fr_LRTD_TD_dec = 0;

            move16();