Commit 990d81ca authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1250_MCMASA_LS_OUTPUT

parent f9978bff

lib_com/options.h

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


#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

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

#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */

#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 */

lib_dec/ivas_dirac_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -3901,14 +3901,10 @@ 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++ )

            {