Commit 8c97d14d authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_978_MC_TDREND_REVERB

parent 9c8d48ff

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ 


//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */



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

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

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS            /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

lib_dec/ivas_init_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -2291,11 +2291,7 @@ ivas_error ivas_init_decoder_fx( 
            move16();

        }



#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#else

        IF( EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

        {

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

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

lib_dec/ivas_ism_dec_fx.c

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

                    return error;

                }

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

                IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#else

                IF( EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

                {

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

                    IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )

lib_dec/ivas_objectRenderer_internal_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -237,11 +237,7 @@ ivas_error ivas_td_binaural_renderer_sf_fx( 
        }



        test();

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        IF( st_ivas->hRenderConfig != NULL && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#else

        IF( st_ivas->hRenderConfig != NULL && EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

        {

            FOR( i = 0; i < nchan_ism_internal; ++i )

            {
@@ -273,11 +269,7 @@ ivas_error ivas_td_binaural_renderer_sf_fx( 
        }



        test();

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        IF( st_ivas->hRenderConfig != NULL && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#else

        IF( st_ivas->hRenderConfig != NULL && EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

        {

            /* add reverb to rendered signals */

            v_add_32( reverb_signal_fx[0], output_fx_local[0], output_fx_local[0], output_frame ); // Q11