From 044a26d8cc132b084ea811ffe502e8e046b1bdc2 Mon Sep 17 00:00:00 2001 From: Fabian Bauer Date: Mon, 19 Jan 2026 11:07:34 +0100 Subject: [PATCH 1/6] introduce macro --- lib_com/options.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib_com/options.h b/lib_com/options.h index a112a55d0..2522e06f4 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -97,6 +97,7 @@ #define CLEANUP_HQ_CORE /* VA: basop issue 2300: Remove unused code in core-coder: HQ core */ #define REMOVE_UNUSED_CODE_IVAS_DEC /* VA: remove unused code in ivas_jbm_dec_tc_fx() */ #define FIX_2294_CLANG_18_WARNINGS_ENC /* VA: Fix some encoder clang-18 warnings, desc. in 2294 */ +#define FIX_2330_CLANG_18_WARNINGS_REND /* FhG: Fix renderer warnings */ #define REMOVE_CAM_FROM_IVAS /* VA: basop issue 210: remove obsoelte CAM code from IVAS */ #define OPT_BE_2311_HARM_GSC_GAIN /* VA: issue 2311: BE part of the GSC gain harmonization pipeline #70380 shows the BE */ #define HARM_CORECODER_UPDT /* VA: basop issue 2342: Remove duplicated code in core-coder common update functions */ -- GitLab From 111e1f19d60e28448c2d68d6d7ce8863100a320b Mon Sep 17 00:00:00 2001 From: Fabian Bauer Date: Tue, 20 Jan 2026 10:10:46 +0100 Subject: [PATCH 2/6] ommit calculation of proto_frame_dec_f_q in intermidiate_ext_dirac_render() for testing purposes --- lib_rend/lib_rend_fx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c index e7534b558..f29b4ed19 100644 --- a/lib_rend/lib_rend_fx.c +++ b/lib_rend/lib_rend_fx.c @@ -10579,6 +10579,8 @@ static ivas_error ivas_masa_ext_rend_dirac_rend_init( * memory allocation *-----------------------------------------------------------------*/ + /*TODO 2230: Should we allocate memory here for proto_frame_dec_f_fx and set proto_frame_dec_f_q? */ + IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) ) { hDirACRend->proto_frame_f_fx = NULL; @@ -11230,8 +11232,8 @@ static void intermidiate_ext_dirac_render( move16(); } } - hDirACRend->proto_frame_dec_f_q = sub( 31, hDirACRend->proto_frame_dec_f_q ); - move16(); + //hDirACRend->proto_frame_dec_f_q = sub( 31, hDirACRend->proto_frame_dec_f_q ); + //move16(); IF( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx ) { -- GitLab From a91f92c131038323dec46e7ccce063e20923d3ba Mon Sep 17 00:00:00 2001 From: Fabian Bauer Date: Tue, 20 Jan 2026 10:12:26 +0100 Subject: [PATCH 3/6] try correct format --- lib_rend/lib_rend_fx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c index f29b4ed19..a9c98aec6 100644 --- a/lib_rend/lib_rend_fx.c +++ b/lib_rend/lib_rend_fx.c @@ -11232,8 +11232,8 @@ static void intermidiate_ext_dirac_render( move16(); } } - //hDirACRend->proto_frame_dec_f_q = sub( 31, hDirACRend->proto_frame_dec_f_q ); - //move16(); + // hDirACRend->proto_frame_dec_f_q = sub( 31, hDirACRend->proto_frame_dec_f_q ); + // move16(); IF( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx ) { -- GitLab From 566ea4a613348260e47f41e5c4cdf55cd7522ddd Mon Sep 17 00:00:00 2001 From: Fabian Bauer Date: Tue, 20 Jan 2026 10:44:35 +0100 Subject: [PATCH 4/6] inplement macro into lib_rend_fx.c --- lib_rend/lib_rend_fx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c index a9c98aec6..8fcdc1771 100644 --- a/lib_rend/lib_rend_fx.c +++ b/lib_rend/lib_rend_fx.c @@ -11232,8 +11232,10 @@ static void intermidiate_ext_dirac_render( move16(); } } - // hDirACRend->proto_frame_dec_f_q = sub( 31, hDirACRend->proto_frame_dec_f_q ); - // move16(); +#ifndef FIX_2330_CLANG_18_WARNINGS_REND + hDirACRend->proto_frame_dec_f_q = sub( 31, hDirACRend->proto_frame_dec_f_q ); + move16(); +#endif IF( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx ) { -- GitLab From a87299cd4e27789f72465e1359100875f05c232d Mon Sep 17 00:00:00 2001 From: Fabian Bauer Date: Tue, 20 Jan 2026 10:34:40 +0000 Subject: [PATCH 5/6] cleanup --- lib_rend/lib_rend_fx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c index a9c98aec6..d21043981 100644 --- a/lib_rend/lib_rend_fx.c +++ b/lib_rend/lib_rend_fx.c @@ -10579,8 +10579,6 @@ static ivas_error ivas_masa_ext_rend_dirac_rend_init( * memory allocation *-----------------------------------------------------------------*/ - /*TODO 2230: Should we allocate memory here for proto_frame_dec_f_fx and set proto_frame_dec_f_q? */ - IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) ) { hDirACRend->proto_frame_f_fx = NULL; -- GitLab From 2d80f7be56a4a49754de3bb899e8ff52b5366842 Mon Sep 17 00:00:00 2001 From: Fabian Bauer Date: Tue, 20 Jan 2026 10:35:46 +0000 Subject: [PATCH 6/6] incorporate macro correctly --- lib_rend/lib_rend_fx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c index d21043981..da6c59749 100644 --- a/lib_rend/lib_rend_fx.c +++ b/lib_rend/lib_rend_fx.c @@ -11230,8 +11230,10 @@ static void intermidiate_ext_dirac_render( move16(); } } - // hDirACRend->proto_frame_dec_f_q = sub( 31, hDirACRend->proto_frame_dec_f_q ); - // move16(); +#ifndef FIX_2330_CLANG_18_WARNINGS_REND + hDirACRend->proto_frame_dec_f_q = sub( 31, hDirACRend->proto_frame_dec_f_q ); + move16(); +#endif IF( hDirACRend->h_output_synthesis_psd_state.proto_power_smooth_fx ) { -- GitLab