diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index e3aa386d88ab34678c3be3e2564770e318ec9d6d..6c85763a87b6d92e2f3a6ae6a73818526f2590de 100644 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -3878,11 +3878,13 @@ void ivas_param_mc_dec_render( float *output_f[] /* o : rendered time signal */ ); +#ifndef FIX_1023_REMOVE_PARAMMC_DEC void ivas_param_mc_dec( Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ float *output_f[] /* i/o: synthesized core-coder transport channels/DirAC output */ ); +#endif /*! r: number of cldfb synthesis instances */ int16_t param_mc_get_num_cldfb_syntheses( Decoder_Struct *st_ivas /* i : IVAS decoder structure */ diff --git a/lib_com/options.h b/lib_com/options.h index c1580c1cb5d1fa49922d33acecdea369d18e1123..92da192a5d32eee189d8bc6c060a97c63aa8edf0 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -190,6 +190,7 @@ //#define FIX_777_COMBI_RENDER_CONFIG_FILE /* Philips: Fix for combined renderer config file support */ /* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF */ /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on )*/ #define FIX_1024_REMOVE_PARAMMC_MIXING_MAT /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */ +#define FIX_1023_REMOVE_PARAMMC_DEC /* VA: issue 1023: remove unused function ivas_param_mc_dec() */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec.c index 5405fbba6048dfb87f543b76e7f2626ac0c0d1bf..ccb95aa12608524638772ff1d13054c4e2dce139 100644 --- a/lib_dec/ivas_mc_param_dec.c +++ b/lib_dec/ivas_mc_param_dec.c @@ -1535,9 +1535,9 @@ void ivas_param_mc_dec_digest_tc( /*------------------------------------------------------------------------- - * ivas_param_mc_dec() + * ivas_param_mc_dec_render() * - * Parametric MC decoding process + * Parametric MC rendering process *------------------------------------------------------------------------*/ void ivas_param_mc_dec_render( @@ -1857,6 +1857,7 @@ void ivas_param_mc_dec_render( return; } +#ifndef FIX_1023_REMOVE_PARAMMC_DEC /*------------------------------------------------------------------------- * ivas_param_mc_dec() @@ -1898,6 +1899,7 @@ void ivas_param_mc_dec( return; } +#endif /*------------------------------------------------------------------------- * param_mc_dec_init()