Commit b04222cf authored by norvell's avatar norvell
Browse files

Add NONBE_FIX_978_MC_TDREND_REVERB to enable reverb for TD rend with MC

parent 30f20459

lib_com/options.h

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


#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1940,7 +1940,11 @@ 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

        {

            if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

            {

lib_dec/ivas_ism_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -199,7 +199,11 @@ 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->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                    {

lib_dec/ivas_objectRenderer_internal.c

+8 −0
Original line number Diff line number Diff line
@@ -188,7 +188,11 @@ 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 )

            {
@@ -204,7 +208,11 @@ 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 );