Commit c4a2e549 authored by vaclav's avatar vaclav
Browse files

Merge branch '1250-crash-in-mcmasa-to-custom-ls-output' into 'main' 

[non-BE] Fix crash in McMASA to custom LS output

See merge request !2139
parents 526ef271 9e3ea6af

lib_com/options.h

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


#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1250_MCMASA_LS_OUTPUT                     /* VA: issue 1250: fix crash in McMASA to custom LS output decoding */





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

lib_dec/ivas_dirac_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -2453,7 +2453,14 @@ void ivas_dirac_dec_render_sf( 


            /* Move the separated and the LFE channels to temporary variables as spatial synthesis may overwrite current channels */

            mvr2r( &( output_f[st_ivas->hOutSetup.separateChannelIndex][subframe_start_sample] ), tmp_separated, num_samples_subframe );

#ifdef NONBE_1250_MCMASA_LS_OUTPUT

            if ( hDirACRend->hOutSetup.num_lfe > 0 )

            {

                mvr2r( &( output_f[LFE_CHANNEL][subframe_start_sample] ), tmp_lfe, num_samples_subframe );

            }

#else

            mvr2r( &( output_f[LFE_CHANNEL][subframe_start_sample] ), tmp_lfe, num_samples_subframe );

#endif



            for ( ch = 0; ch < outchannels; ch++ )

            {