Commit ebb8e3f6 authored by kinuthia's avatar kinuthia
Browse files

activate reverb for TDREND MC with head-tracking

parent 9a67eeee

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 
#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_977_OSBA_GAIN_MISMATCH                      /* Dlb : issue 977 : Output gain mismatch for different bit rates in OSBA */

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



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_init_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -1990,8 +1990,11 @@ ivas_error ivas_init_decoder( 
        {

            return error;

        }



#ifdef NONBE_FIX_MC_TDREND_REVERB

        if ( st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_5_1 || st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_7_1 )

#else

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

#endif // DEBUG

        {

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

            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

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

            return error;

        }



#ifdef NONBE_FIX_MC_TDREND_REVERB

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

#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 )

            {
@@ -203,8 +206,11 @@ ivas_error ivas_td_binaural_renderer_sf( 
        {

            return error;

        }



#ifdef NONBE_FIX_MC_TDREND_REVERB

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

#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 );