Commit a168078f authored by kinuthia's avatar kinuthia
Browse files

Enable reverb for TD renderer for 5.1 and 7.1 with headtracking enabled for IVAS_dec 

Under FIX_329_ENABLE_TD_RENDERER_REVERB_MC define
parent 9f858d30

lib_com/options.h

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


#define FIX_317                                         /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */



#define FIX_329_ENABLE_TD_RENDERER_REVERB_MC            /* Eri: Enable reverb for TD renderer for 5.1 and 7.1 with headtracking enabled for IVAS_dec */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_rend/ivas_binauralRenderer.c

+11 −0
Original line number Diff line number Diff line
@@ -929,7 +929,18 @@ void ivas_binaural_add_LFE( 
    if ( render_lfe )

    {

#ifdef FIX_197_CREND_INTERFACE

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

        {

            gain = GAIN_LFE;

        }

        else

        {

            gain = ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hHrtfCrend != NULL ) ) ? st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe : GAIN_LFE;

        }

#else

        gain = ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hHrtfCrend != NULL ) ) ? st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe : GAIN_LFE;

#endif

#else

        gain = st_ivas->hHrtf != NULL ? st_ivas->hHrtf->gain_lfe : GAIN_LFE;

#endif

lib_rend/ivas_output_init.c

+12 −0
Original line number Diff line number Diff line
@@ -434,7 +434,19 @@ void ivas_renderer_select( 
                }

                else /* AUDIO_CONFIG_BINAURAL_ROOM */

                {

#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC

#ifdef DEBUGGING

                    if ( ( ( ( st_ivas->transport_config == AUDIO_CONFIG_5_1 || st_ivas->transport_config == AUDIO_CONFIG_7_1 ) && st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hRenderConfig->roomAcoustics.use_brir == 0 ) || ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && ( st_ivas->mc_mode == MC_MODE_MCT ) && !( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) )

#else

                    if ( ( st_ivas->transport_config == AUDIO_CONFIG_5_1 || st_ivas->transport_config == AUDIO_CONFIG_7_1 ) && st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hRenderConfig->roomAcoustics.use_brir == 0 && ( st_ivas->mc_mode == MC_MODE_MCT ) )

#endif

                    {

                        *renderer_type = RENDERER_BINAURAL_OBJECTS_TD;

                    }

                    else if ( st_ivas->mc_mode == MC_MODE_MCT )

#else

                    if ( st_ivas->mc_mode == MC_MODE_MCT )

#endif

                    {

                        *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;

                    }