From fde18adae70b25da7290b9f8903515428e2a167d Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 6 Mar 2024 17:59:15 +0100 Subject: [PATCH] issue 960: unused function syn_output() is removed; under FIX_960_SYN_OUTPUT --- lib_com/options.h | 1 + lib_com/prot.h | 2 ++ lib_dec/syn_outp.c | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 52901ec9c4..ad7191a8f3 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -159,6 +159,7 @@ #define FIX_998_UNUSED_FUNCTION /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */ #define FIX_1009_ISM_NONDIEGETIC_PANNING /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan */ #define FIX_993_REMOVE_SBA_GET_ORDER /* VA: issue 993: remove unused function ivas_sba_get_order() */ +#define FIX_960_SYN_OUTPUT /* VA: issue 960: unused function syn_output() is removed */ /* #################### End BE switches ################################## */ diff --git a/lib_com/prot.h b/lib_com/prot.h index 87f01a9161..69688e87de 100644 --- a/lib_com/prot.h +++ b/lib_com/prot.h @@ -4822,12 +4822,14 @@ void dec_acelp_4t64( const int16_t Opt_AMR_WB /* i : flag indicating AMR-WB IO mode */ ); +#ifndef FIX_960_SYN_OUTPUT uint32_t syn_output( float *synth, /* i/o: float synthesis signal */ const int16_t output_frame, /* i : output frame length */ int16_t *synth_out /* o : integer 16 bits synthesis signal */ ); +#endif void FEC_exc_estim( Decoder_State *st, /* i/o: Decoder static memory */ const int16_t L_frame, /* i : length of the frame */ diff --git a/lib_dec/syn_outp.c b/lib_dec/syn_outp.c index 8e60b31c85..865df569f3 100644 --- a/lib_dec/syn_outp.c +++ b/lib_dec/syn_outp.c @@ -44,6 +44,10 @@ #include "prot.h" #include "wmc_auto.h" + +#ifdef FIX_960_SYN_OUTPUT +/* Note: syn_output() is replaced by ivas_syn_output() in IVAS */ +#else /*-------------------------------------------------------------------* * syn_output() * @@ -65,6 +69,7 @@ uint32_t syn_output( /* integer conversion */ return mvr2s( synth, synth_out, output_frame ); } +#endif /*-------------------------------------------------------------------* -- GitLab