Commit 7ffdb540 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch... 

Merge branch '571-reverb-not-activated-for-discrete-and-parametric-ism-bitrate-sw-fix' into '571-reverb-not-activated-for-discrete-and-parametric-ism'

enable reverb for ISM mode switching to DiscISM for the first time switching happpens.

See merge request !804
parents 28e1baf1 c21992b0

lib_dec/ivas_ism_dec.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -184,6 +184,15 @@ static ivas_error ivas_ism_bitrate_switching( 
                {

                {

                    return error;

                    return error;

                }

                }

#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

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

                {

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

                    {

                        return error;

                    }

                }

#endif

            }

            }

        }

        }

        else

        else
@@ -258,6 +267,14 @@ static ivas_error ivas_ism_bitrate_switching( 
                {

                {

                    st_ivas->hHrtfTD = NULL;

                    st_ivas->hHrtfTD = NULL;

                }

                }



#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                if (st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB)

                {

                    ivas_reverb_close( &st_ivas->hReverb );

                }



#endif

            }

            }

        }

        }

        else

        else