From 1b28a1f105de1ae2d0b3e1efb40a40bb817d321c Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 13 Nov 2023 14:50:17 +0100 Subject: [PATCH 1/2] issue 902: remove a hack in ivas_core_dec(); under FIX_902_HACK_IN_CORECODER --- lib_com/options.h | 1 + lib_dec/ivas_core_dec.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index f44ad78c49..e52080bb87 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -151,6 +151,7 @@ /*#define SPLIT_REND_WITH_HEAD_ROT */ /* Dlb,FhG: Split Rendering contributions 21 and 35 */ #define FIX_643_PCA_OPTION /* VA: issue 643: rename PCA bypass command-line option */ +#define FIX_902_HACK_IN_CORECODER /* VA: issue 902: remove a hack in ivas_core_dec() */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c index c05c003535..b5e99022fe 100644 --- a/lib_dec/ivas_core_dec.c +++ b/lib_dec/ivas_core_dec.c @@ -112,7 +112,11 @@ ivas_error ivas_core_dec( sts = hSCE->hCoreCoder; hStereoICBWE = NULL; element_brate = hSCE->element_brate; +#ifdef FIX_902_HACK_IN_CORECODER + last_element_brate = hSCE->last_element_brate; +#else last_element_brate = hSCE->element_brate; /* hack - the past parameter is not really needed */ +#endif last_element_mode = IVAS_SCE; hStereoTD = NULL; p_output_mem = NULL; -- GitLab From c1727b11e9448202903ad08ae5b95cd0a57df136 Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 21 Nov 2023 09:38:19 +0100 Subject: [PATCH 2/2] add comment: /* note: this parameter is unused */ --- lib_dec/ivas_core_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c index b5e99022fe..423a673e8d 100644 --- a/lib_dec/ivas_core_dec.c +++ b/lib_dec/ivas_core_dec.c @@ -113,7 +113,7 @@ ivas_error ivas_core_dec( hStereoICBWE = NULL; element_brate = hSCE->element_brate; #ifdef FIX_902_HACK_IN_CORECODER - last_element_brate = hSCE->last_element_brate; + last_element_brate = hSCE->last_element_brate; /* note: this parameter is unused */ #else last_element_brate = hSCE->element_brate; /* hack - the past parameter is not really needed */ #endif -- GitLab