Commit a1eeca90 authored Aug 14, 2023 by vaclav

Merge branch '703-evs-memory-increse-with-fix_264_audio_channels_to_heap' into 'main'

Resolve "EVS memory increase with FIX_264_AUDIO_CHANNELS_TO_HEAP"

See merge request !960

parents 1c3fc634 f34d1279

lib_enc/ivas_init_enc.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -417,7 +417,11 @@ ivas_error ivas_init_encoder(
		-----------------------------------------------------------------/

		nchan_inp_buff = hEncoderConfig->nchan_inp;
		if ( ivas_format == MASA_ISM_FORMAT )
		if ( ivas_format == MONO_FORMAT )
		{
		nchan_inp_buff = 0;
		}
		else if ( ivas_format == MASA_ISM_FORMAT )
		{
		if ( hEncoderConfig->nchan_inp - hEncoderConfig->nchan_ism == 1 ) /* mono is duplicated in monoMASA */
		{

lib_rend/ivas_output_init.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -274,7 +274,11 @@ int16_t ivas_get_nchan_buffers_dec(

		nchan_out_buff = MAX_OUTPUT_CHANNELS;

		if ( st_ivas->ivas_format == STEREO_FORMAT )
		if ( st_ivas->ivas_format == MONO_FORMAT )
		{
		nchan_out_buff = 0;
		}
		else if ( st_ivas->ivas_format == STEREO_FORMAT )
		{
		nchan_out_buff = max( st_ivas->hDecoderConfig->nchan_out, CPE_CHANNELS );
		}