From bc682eddc06800b7ec455b20ec5c3134e911f6b1 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 20 Aug 2025 12:56:03 +0200 Subject: [PATCH] port MR --- lib_com/options.h | 1 + lib_dec/ivas_dirac_dec_fx.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 031644459..4b9678bc8 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -138,6 +138,7 @@ #define NONBE_1240_FIX_CORE_SELECTION_ISM_SW /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */ #define FIX_1101_CLEANING_JBM_CALL /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */ #define NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */ +#define NONBE_1250_MCMASA_LS_OUTPUT /* VA: issue 1250: fix crash in McMASA to custom LS output decoding */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_dec/ivas_dirac_dec_fx.c b/lib_dec/ivas_dirac_dec_fx.c index 5c6457df3..39bcf9039 100644 --- a/lib_dec/ivas_dirac_dec_fx.c +++ b/lib_dec/ivas_dirac_dec_fx.c @@ -4006,7 +4006,15 @@ void ivas_dirac_dec_render_sf_fx( /* Move the separated and the LFE channels to temporary variables as spatial synthesis may overwrite current channels */ Copy32( &( output_buf_fx[st_ivas->hOutSetup.separateChannelIndex][subframe_start_sample] ), tmp_separated_fx, num_samples_subframe ); +#ifdef NONBE_1250_MCMASA_LS_OUTPUT + if ( hDirACRend->hOutSetup.num_lfe > 0 ) + { + Copy32( &( output_buf_fx[LFE_CHANNEL][subframe_start_sample] ), tmp_lfe_fx, num_samples_subframe ); + } +#else Copy32( &( output_buf_fx[LFE_CHANNEL][subframe_start_sample] ), tmp_lfe_fx, num_samples_subframe ); +#endif + FOR( ch = 0; ch < outchannels; ch++ ) { -- GitLab