Commit 5ee3dca9 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch '571-reverb-not-activated-for-discrete-and-parametric-ism-draft'... 

Merge branch '571-reverb-not-activated-for-discrete-and-parametric-ism-draft' into '571-reverb-not-activated-for-discrete-and-parametric-ism'

Resolve "Reverb not activated for discrete and parametric ISM"

See merge request !791
parents 128fd43c 10829f91

lib_dec/ivas_binRenderer_internal.c

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



    /* Allocate memories needed for reverb module */

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

    {

        if ( ( error = ivas_binaural_reverb_open( &( hBinRenderer->hReverb ),

                                                  hBinRenderer->conv_band,
@@ -731,7 +735,11 @@ ivas_error ivas_binRenderer_open( 
                                                  &( st_ivas->hRenderConfig->roomAcoustics ),

                                                  st_ivas->hIntSetup.output_config,

                                                  st_ivas->hDecoderConfig->output_Fs,

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                                                  RENDERER_BINAURAL_FASTCONV,

#else

                                                  RENDERER_BINAURAL_FASTCONV_ROOM,

#endif

                                                  st_ivas->hHrtfFastConv,

                                                  st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

        {

lib_dec/ivas_output_config.c

+12 −0
Original line number Diff line number Diff line
@@ -82,7 +82,11 @@ void ivas_renderer_select( 
        {

            if ( st_ivas->ism_mode == ISM_MODE_PARAM )

            {

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                if ( output_config == AUDIO_CONFIG_BINAURAL )

#else

                if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

                {

                    *renderer_type = RENDERER_BINAURAL_PARAMETRIC;

                }
@@ -147,7 +151,11 @@ void ivas_renderer_select( 
        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {

            *internal_config = AUDIO_CONFIG_HOA3;

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

            if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

            if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

            {

                *renderer_type = RENDERER_BINAURAL_FASTCONV;

            }
@@ -195,7 +203,11 @@ void ivas_renderer_select( 
            else

            {

                *internal_config = transport_config;

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

                if ( output_config == AUDIO_CONFIG_BINAURAL )

#endif

                {

#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->hDecoderConfig->Opt_ExternalOrientation ) ) || ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && !( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) )

lib_rend/ivas_reverb.c

+8 −0
Original line number Diff line number Diff line
@@ -1813,7 +1813,11 @@ ivas_error ivas_binaural_reverb_open( 
        set_f( hReverb->preDelayBufferImag[k], 0.0f, hReverb->numBins );

    }



#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

    if ( renderer_type == RENDERER_BINAURAL_FASTCONV )

#else

    if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

    {

        if ( !roomAcoustics->override )

        {
@@ -1900,7 +1904,11 @@ ivas_error ivas_binaural_reverb_open( 
    }

    else

    {

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

        if (renderer_type == RENDERER_BINAURAL_FASTCONV )

#else

        if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

        {

            ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfFastConv->fastconvReverberationTimes, hHrtfFastConv->fastconvReverberationEneCorrections );

            ivas_binaural_reverb_setPreDelay( hReverb, 10 );