Commit bc682edd authored by vaclav's avatar vaclav
Browse files

port MR

parent f79297d5

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -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 ############################ */

lib_dec/ivas_dirac_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -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++ )

            {