Commit 96b69bd9 authored by multrus's avatar multrus
Browse files

BASOP issue 2521: Fix wrong porting for determination of first subframe length... 

BASOP issue 2521: Fix wrong porting for determination of first subframe length in ivas_sba_dirac_stereo_compute_td_stefi_nrgs()
parent a8ff39cd

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ 
#define FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN           /* Nokia: BASOP issue 2513: Removes extra return block */

#define FIX_BASOP_2514_EFAP_PORTING_ERROR               /* Nokia: BASOP issue 2514: Fix wrongly ported line */

#define FIX_BASOP_2516_REND_CUSTOM_LAYOUT_PORT_BUG      /* Nokia: BASOP issue 2516: Fix porting bug in setting planar state for custom layout in renderer */

#define FIX_BASOP_2521_DIRAC_STEREO_STEFFI_NRGS         /* FhG: BASOP issue 2521: Fix wrong porting for determination of first subframe length in ivas_sba_dirac_stereo_compute_td_stefi_nrgs() */



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

lib_dec/ivas_sba_dirac_stereo_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -693,7 +693,11 @@ static void ivas_sba_dirac_stereo_compute_td_stefi_nrgs( 
    test();

    IF( ( EQ_16( core, ACELP_CORE ) && !fd_cng_flag ) || EQ_16( hStereoDft->core_hist[1], ACELP_CORE ) )

    {

#ifdef FIX_BASOP_2521_DIRAC_STEREO_STEFFI_NRGS

        FOR( i = 0; i < shr( output_frame, 1 ); i++ )

#else

        FOR( i = 0; i < shr( output_frame, 2 ); i++ )

#endif

        {

            hb_nrg2 = Madd_32_32( hb_nrg2, hb_synth[i], hb_synth[i] ); /*2*q_hb_synth-31*/

        }