Commit 1d8e1fde authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into basop-2442-masa-2tc-rendering-to-mono-large-diff-signal-12-khz
parents 544346eb ac879f74

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ 
#define NONBE_FIX_2575                                  /* Fhg: Fix issue 2575, precision loss in FD CNG */

#define FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI         /* Nokia: BASOP issue 2442: Increase accuracy of computations and add additional gain clamp for low energy decorrelated signal rendering. */



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



/* ##################### End NON-BE switches ########################### */



/* ################## End MAINTENANCE switches ######################### */

lib_dec/FEC_scale_syn_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -265,7 +265,11 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -1838,7 +1838,11 @@ 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

+6 −3
Original line number Diff line number Diff line
@@ -182,9 +182,12 @@ 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 );



        }

        p_Aq_fx += ( M + 1 );

        pt_pitch_fx++;

        st_fx->tilt_code_dec_fx[tmp_idx] = st_fx->tilt_code_fx;

lib_enc/ivas_stereo_td_analysis_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -242,7 +242,11 @@ 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();