diff --git a/lib_com/options.h b/lib_com/options.h index 91172d59afc4c1193ebe4ee2bdc32e06835c7138..91b99736b0b8d7190ef8258db933ef67d252a7a8 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -120,6 +120,7 @@ #define NONBE_FIX_986_MC_BW_SWITCHING /* FhG: fix crash in bw and br switching with MC */ #define NONBE_FIX_975_JBM_USAN /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */ #define FIX_699_FILE_READER_JBM_TSM /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */ +#define FIX_997_REMOVE_SPAR_DEC_UPMIXER /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */ #define NONBE_FIX_947_STEREO_DMX_EVS_POC /* Orange: Fix clicks on POC */ #ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC diff --git a/lib_dec/ivas_spar_decoder_fx.c b/lib_dec/ivas_spar_decoder_fx.c index 2c425ad72374b4a194242b3b08c044f7d8cd8f9f..b13c6ab7a92b30bf250fa997d52a6eab6661de8d 100644 --- a/lib_dec/ivas_spar_decoder_fx.c +++ b/lib_dec/ivas_spar_decoder_fx.c @@ -1534,12 +1534,20 @@ void ivas_spar_dec_set_render_map_fx( 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_fx( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */