Commit 04583111 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_955_FASTCONV_REND_IN_ISM

parent b0621683

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ 
#define FIX_963_USAN_ERROR                              /* Eri: Issue 963: USAN error in Stereo CNG, division by zero */

#define NONBE_FIX_952_MC_PARAMUPMIX_5MS                 /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/

#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER     /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

#define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */

#define NONBE_FIX_967_ISM_MONO_DMX                      /* FhG: issue 967: accumulating energies in ISM mono DMX */

#define FIX_959_MASA_LINEAR_REND                        /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */

lib_dec/ivas_jbm_dec_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -1984,7 +1984,6 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                ivas_apply_non_diegetic_panning_fx( p_output_fx, st_ivas->hDecoderConfig->non_diegetic_pan_gain_fx, *nSamplesRendered );

            }

#ifdef FIX_955_FASTCONV_REND_IN_ISM

#ifdef DEBUGGING

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )

#else
@@ -1992,11 +1991,6 @@ ivas_error ivas_jbm_dec_render_fx( 
#endif

            {

                /* Convert to Ambisonics */

#else

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )

            {

/* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */

#endif

                FOR( i = 0; i < st_ivas->nchan_transport; i++ )

                {

                    FOR( j = 0; j < HOA3_CHANNELS; j++ )