Commit 6aaea8d6 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 2122_basop_delay_alignment_split_rendering_and_external_rend_crashes_omasa

parents 42bc9c81 27aa6a12

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
#define FIX_2082_FP_LEFTOVERS_OMASA_DEC                      /* Nokia: fix for issue 2082, cleaning remaining floating point code */

#define FIX_2174_JBM_BASOP_ALIGNMENT                         /* VoiceAge, Nokia: Fixes to JBM BASOP implementation and alignment to float */





#define FIX_2176_ASSERT_DEC_MAP_PARAMS_DIRAC2STEREO          /* FhG: Reduce hStereoDft->q_smooth_buf_fx by one to prevent overflow in the subframe_band_nrg[][] calculation */

/* ################### End FIXES switches ########################### */



/* #################### Start BASOP porting switches ############################ */

lib_dec/ivas_stereo_dft_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -220,7 +220,11 @@ void stereo_dft_dec_reset_fx( 
    {

        set32_fx( hStereoDft->smooth_buf_fx[i], 0, SBA_DIRAC_NRG_SMOOTH_LONG + 1 );

    }

#ifdef FIX_2176_ASSERT_DEC_MAP_PARAMS_DIRAC2STEREO

    hStereoDft->q_smooth_buf_fx = Q6;

#else

    hStereoDft->q_smooth_buf_fx = Q7;

#endif

    move16();

    set16_fx( hStereoDft->smooth_fac_fx[0], 0, SBA_DIRAC_STEREO_NUM_BANDS );

    set16_fx( hStereoDft->smooth_fac_fx[1], 0, SBA_DIRAC_STEREO_NUM_BANDS );