Commit a9704292 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Activates reverb for parametric ISM

parent 7e473c0e

lib_dec/ivas_output_config.c

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ void ivas_renderer_select( 
                        *internal_config = output_config;

#else

                        *internal_config = AUDIO_CONFIG_BINAURAL;

#endif // FIX_571_REVERB_NOT_ACTIVATED_ISM

#endif

                    }

#else

                    *renderer_type = RENDERER_BINAURAL_OBJECTS_TD;
@@ -116,7 +116,7 @@ void ivas_renderer_select( 
                    *internal_config = output_config;

#else

                    *internal_config = AUDIO_CONFIG_BINAURAL;

#endif // FIX_571_REVERB_NOT_ACTIVATED_ISM

#endif

#endif

                }

                else

lib_rend/ivas_dirac_dec_binaural_functions.c

+8 −0
Original line number Diff line number Diff line
@@ -1378,7 +1378,11 @@ static void ivas_dirac_dec_binaural_process_output( 
    offsetSamples = 0;

    nSlots = st_ivas->hDirAC->subframe_nbslots[subframe];



#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM )

#endif

    {

        /* Process second / room effect part of binaural output when needed */

        ivas_binaural_reverb_processSubframe( st_ivas->hDiracDecBin->hReverb, numInChannels, nSlots, inRe, inIm, reverbRe, reverbIm );
@@ -1445,7 +1449,11 @@ static void ivas_dirac_dec_binaural_process_output( 
                }

            }



#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM )

#endif

            {

                /* Combine second (reverb) part with the first (HRTF) part to obtain binaural output signal with room effect */

                v_add( outSlotRe, reverbRe[chA][slot], outSlotRe, CLDFB_NO_CHANNELS_MAX );