Commit 21f0026a authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_978_MC_TDREND_REVERB

parent 589ef91e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_978_MC_TDREND_REVERB                        /* Eri : activate reverb for TDREND with headtracking */

#define NONBE_FIX_984_OMASA_EXT_OUTPUT                        /* Nokia: issue #984: complete the OMASA EXT output implementation */

#define NONBE_FIX_1000_G1_G2_SWB_TBE                          /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */

#define NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

lib_dec/ivas_init_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2010,11 +2010,7 @@ ivas_error ivas_init_decoder( 
        {

            return error;

        }

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

        if ( st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif // DEBUG

        {

            if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

            {

lib_dec/ivas_ism_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -199,11 +199,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
                {

                    return error;

                }

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

                if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

                if ( st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

                {

                    if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                    {

lib_dec/ivas_objectRenderer_internal.c

+0 −8
Original line number Diff line number Diff line
@@ -187,11 +187,7 @@ ivas_error ivas_td_binaural_renderer_sf( 
        {

            return error;

        }

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        if ( st_ivas->hRenderConfig != NULL && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

        if ( st_ivas->hRenderConfig != NULL && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

        {

            if ( ( error = ivas_reverb_process( st_ivas->hReverb, st_ivas->transport_config, 0, tc_local, p_reverb_signal, 0 ) ) != IVAS_ERR_OK )

            {
@@ -206,11 +202,7 @@ ivas_error ivas_td_binaural_renderer_sf( 
        {

            return error;

        }

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        if ( st_ivas->hRenderConfig != NULL && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

        if ( st_ivas->hRenderConfig != NULL && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

        {

            /* add reverb to rendered signals */

            v_add( reverb_signal[0], output_f_local[0], output_f_local[0], output_frame );