From f34d1279906d81c8286f336b7453e32dee155683 Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 14 Aug 2023 07:55:44 +0200 Subject: [PATCH] fix #703: EVS memory increase with FIX_264_AUDIO_CHANNELS_TO_HEAP --- lib_enc/ivas_init_enc.c | 6 +++++- lib_rend/ivas_output_init.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index a7b01c2cec..3b0fa49d7b 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -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 */ { diff --git a/lib_rend/ivas_output_init.c b/lib_rend/ivas_output_init.c index 990d36c8f0..36888cc72d 100644 --- a/lib_rend/ivas_output_init.c +++ b/lib_rend/ivas_output_init.c @@ -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 ); } -- GitLab