Commit 35ea3745 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_955_FASTCONV_REND_IN_ISM

parent c9ac3eae

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,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 NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

#define NONBE_FIX_935_SBA_REVERB                              /* FhG: issue 935: fix MSAN error for SBA related to BINAURAL_ROOM_REVERB */

lib_dec/ivas_jbm_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -1073,7 +1073,6 @@ ivas_error ivas_jbm_dec_render( 
                ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

            }



#ifdef FIX_955_FASTCONV_REND_IN_ISM

#ifdef DEBUGGING

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

#else
@@ -1083,13 +1082,6 @@ ivas_error ivas_jbm_dec_render( 
                /* Convert to Ambisonics */

                ivas_ism2sba_sf( st_ivas->hTcBuffer->tc, p_output, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );

            }

#else

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

            {

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

                ivas_ism2sba_sf( st_ivas->hTcBuffer->tc, p_output, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );

            }

#endif



            /* Binaural rendering */

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )