Commit a808be0a authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'basop-2497-mcmasa-lfe-synthesis-has-wrong-subframe-index' into 'main' 

[non-BE] Resolve "McMASA LFE synthesis has wrong subframe index"

Closes #2497

See merge request !2915
parents 466586d6 2634339a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ 
#define FIX_1563_FIX_STEREO_SW                          /* VA: float issue 1563: fix clicks in stereo switching */

#define FIX_1562_DTX_CRASH_DECODER                      /* VA: float issue 1562: fix crash in stereo decoding in DTX and bitrate switching */

#define FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX    /* Nokia: BASOP 2498: Fix the logic */

#define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX        /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */



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

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -3454,7 +3454,11 @@ void ivas_lfe_synth_with_filters_fx( 
    slotSize = shr_r( output_frame, 4 ); // output_frame / CLDFB_NO_COL_MAX

    FOR( slot_index = 0; slot_index < CLDFB_NO_COL_MAX; slot_index++ )

    {

#ifdef FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX

        subframe_index = shr( slot_index, 2 );

#else

        subframe_index = shr( slot_index, 4 );

#endif



        mrange[0] = i_mult( slot_index, slotSize );

        move16();