From 202957360f511c9a0233e89e1bd63683fc945058 Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 15 Feb 2024 13:37:23 +0100 Subject: [PATCH 1/2] issue 997: remove obsolete function ivas_spar_dec_upmixer(); under FIX_997_REMOVE_SPAR_DEC_UPMIXER --- lib_com/ivas_prot.h | 3 ++- lib_com/options.h | 2 +- lib_dec/ivas_spar_decoder.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index 64226d3b72..24483de0dd 100755 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -4360,13 +4360,14 @@ void ivas_spar_dec_upmixer_sf( const int16_t nchan_internal /* i : number of internal channels */ ); +#ifndef FIX_997_REMOVE_SPAR_DEC_UPMIXER void ivas_spar_dec_upmixer( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ float *output[], /* i/o: input/output audio channels */ const int16_t nchan_internal, /* i : number of internal channels */ const int16_t output_frame /* i : output frame length */ ); - +#endif /* MD module */ ivas_error ivas_spar_md_enc_open( ivas_spar_md_enc_state_t **hMdEnc, /* i/o: SPAR MD encoder handle */ diff --git a/lib_com/options.h b/lib_com/options.h index ec62289ea9..4c9219efc0 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -154,7 +154,7 @@ /*#define SPLIT_REND_WITH_HEAD_ROT */ /* Dlb,FhG: Split Rendering contributions 21 and 35 */ #define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */ - +#define FIX_997_REMOVE_SPAR_DEC_UPMIXER /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */ diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c index 9eddbf7e4d..58dcdb6dc7 100644 --- a/lib_dec/ivas_spar_decoder.c +++ b/lib_dec/ivas_spar_decoder.c @@ -1252,7 +1252,7 @@ void ivas_spar_dec_set_render_map( /*-------------------------------------------------------------------* - * ivas_spar_dec_upmixer() + * ivas_spar_dec_set_render_params() * * IVAS SPAR upmixer *-------------------------------------------------------------------*/ @@ -1362,7 +1362,7 @@ void ivas_spar_dec_digest_tc( return; } - +#ifndef FIX_997_REMOVE_SPAR_DEC_UPMIXER /*-------------------------------------------------------------------* * ivas_spar_dec_upmixer() * @@ -1487,7 +1487,7 @@ void ivas_spar_dec_upmixer( return; } - +#endif /*-------------------------------------------------------------------* * ivas_spar_dec_upmixer_sf() -- GitLab From d47f7b046fbfc8f61b2cf7cdd6058bfe4cc5aaf3 Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 16 Feb 2024 08:15:09 +0100 Subject: [PATCH 2/2] correct function description --- lib_dec/ivas_spar_decoder.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c index 58dcdb6dc7..776f606c4d 100644 --- a/lib_dec/ivas_spar_decoder.c +++ b/lib_dec/ivas_spar_decoder.c @@ -1250,12 +1250,19 @@ void ivas_spar_dec_set_render_map( return; } - +#ifdef FIX_997_REMOVE_SPAR_DEC_UPMIXER /*-------------------------------------------------------------------* * ivas_spar_dec_set_render_params() * + * IVAS SPAR set rendering parameters + *-------------------------------------------------------------------*/ +#else +/*-------------------------------------------------------------------* + * ivas_spar_dec_upmixer() + * * IVAS SPAR upmixer *-------------------------------------------------------------------*/ +#endif void ivas_spar_dec_set_render_params( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ -- GitLab