Commit 6f8d51a4 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_935_SBA_REVERB

parent 285b645f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES             /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers */

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

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

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

lib_dec/ivas_output_config.c

+0 −4
Original line number Diff line number Diff line
@@ -160,11 +160,7 @@ void ivas_renderer_select( 
        {

            *internal_config = IVAS_AUDIO_CONFIG_HOA3;



#ifdef NONBE_FIX_935_SBA_REVERB

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL

#else

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

                 || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM

#endif

lib_dec/ivas_sba_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -194,11 +194,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        }

        else

        {

#ifdef NONBE_FIX_935_SBA_REVERB

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL

#else

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

                 || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM

#endif

lib_dec/ivas_spar_decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -250,11 +250,7 @@ ivas_error ivas_spar_dec_open( 
        }



        if ( st_ivas->ivas_format == SBA_ISM_FORMAT &&

#ifdef NONBE_FIX_935_SBA_REVERB

             st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL &&

#else

             ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) &&

#endif

             st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

            /* get correct granularity in case of binaural rendering of the discrete objects with the td obj renderer */