Commit aee2a36f authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_881_REMOVE_LFE_ADDITION_IN_ISM

parent 2142d6b8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM              /* VA: issue 881: remove LFE addition in ISM format */

#define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO              /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */

#define FIX_891_PARAMUPMIX_CLEANUP                      /* Dlb: issue 891: remove unneeded code from ParamUpmix */

#define FIX_917_LCLD_WARNINGS                           /* Dlb: issue 917 and 918: fix LCLD codec warnings*/

lib_dec/ivas_dec.c

+0 −3
Original line number Diff line number Diff line
@@ -321,9 +321,6 @@ ivas_error ivas_dec( 
                {

                    return error;

                }

#ifndef FIX_881_REMOVE_LFE_ADDITION_IN_ISM

                ivas_binaural_add_LFE( st_ivas, output_frame, p_output, p_output );

#endif

            }

#ifdef DEBUGGING

            else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

lib_dec/ivas_jbm_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -1147,9 +1147,6 @@ ivas_error ivas_jbm_dec_render( 
                {

                    return error;

                }

#ifndef FIX_881_REMOVE_LFE_ADDITION_IN_ISM

                ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, p_output, p_output );

#endif

            }

#ifdef DEBUGGING

            else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
@@ -1746,9 +1743,6 @@ ivas_error ivas_jbm_dec_flush_renderer( 
                    {

                        return error;

                    }

#ifndef FIX_881_REMOVE_LFE_ADDITION_IN_ISM

                    ivas_binaural_add_LFE( st_ivas, hTcBuffer->n_samples_granularity, p_output, p_output );

#endif

                }

            }

            else