From 58885bc4b2531c7f5856174a8a032db08166ed0e Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 10 May 2023 15:44:00 +0200 Subject: [PATCH 1/3] Issue 386: Resolve remaining ToDo comments in CoreCoder reconfig.; under FIX_386_CORECODER_RECONFIG_2 --- lib_com/options.h | 2 +- lib_enc/ivas_corecoder_enc_reconfig.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 9c461d84e6..30bf2cd025 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -179,7 +179,7 @@ #define FIX_355_REFACTOR_PARAMBIN_TO_5MS /* Nokia: Fixes issue 355 by refactoring parametric binauralizer code to 5 ms mode */ #define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING /* Eri: Fix incorrect use of stack variable used for channel aware config file */ #define COMBINED_FORMAT_SIGNALING /* VA: Introduce a signaling bit for combined format coding */ - +#define FIX_386_CORECODER_RECONFIG_2 /* VA: Issue 386: Resolve remaining ToDo comments in CoreCoder reconfig. */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c index 080ecc2046..bcd01ac6c3 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -321,7 +321,11 @@ ivas_error ivas_corecoder_enc_reconfig( { if ( n_CoreCoder_existing > cpe_id * CPE_CHANNELS + n ) { +#ifdef FIX_386_CORECODER_RECONFIG_2 + mvr2r( input_buff[n], st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, len_inp_memory ); +#else mvr2r( input_buff[n], st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, len_inp_memory ); /* TODO VoiceAge: Please check if this should be hCoreCoder[n] */ +#endif } } -- GitLab From 10c73861562aaae5c7c044c8eaac02ee945e914a Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 10 May 2023 15:47:20 +0200 Subject: [PATCH 2/3] merge FIX_386_CORECODER_RECONFIG_2 --- lib_com/options.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index af33527793..99a4a6c1ef 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -181,8 +181,6 @@ #define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING /* Eri: Fix incorrect use of stack variable used for channel aware config file */ #define COMBINED_FORMAT_SIGNALING /* VA: Introduce a signaling bit for combined format coding */ #define FIX_386_CORECODER_RECONFIG_2 /* VA: Issue 386: Resolve remaining ToDo comments in CoreCoder reconfig. */ - - #define FIX_440_PARAM_ISM_DIR_NOISE /* FhG: Issue 440: Fix directional background noise becoming diffuse in ParamISM */ #define FIX_447_PARAMBIN_MASA_REGU_FAC /* Nokia: Issue 447: Fix issue by adjusting regularization factor minimum value. */ -- GitLab From 15972cb18d862fe2f9d3ab428106b6437b0fc16d Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 10 May 2023 15:50:09 +0200 Subject: [PATCH 3/3] update within FIX_386_CORECODER_RECONFIG_2 --- lib_enc/ivas_corecoder_enc_reconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c index bcd01ac6c3..fcafb7110c 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -322,7 +322,7 @@ ivas_error ivas_corecoder_enc_reconfig( if ( n_CoreCoder_existing > cpe_id * CPE_CHANNELS + n ) { #ifdef FIX_386_CORECODER_RECONFIG_2 - mvr2r( input_buff[n], st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, len_inp_memory ); + mvr2r( input_buff[n], st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff, len_inp_memory ); #else mvr2r( input_buff[n], st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, len_inp_memory ); /* TODO VoiceAge: Please check if this should be hCoreCoder[n] */ #endif -- GitLab