From d99bf003157115c24a98caf903019c48c2e9fccc Mon Sep 17 00:00:00 2001 From: rtyag Date: Wed, 29 Nov 2023 18:37:31 +1100 Subject: [PATCH 1/2] fix for issue 917 and 918, warning fixes in LCLD codec --- lib_com/options.h | 1 + lib_rend/ivas_NoiseGen.c | 4 ++-- lib_rend/ivas_RMSEnvGrouping.c | 11 ++++++----- lib_rend/ivas_lcld_encoder.c | 6 ++++-- lib_rend/ivas_lcld_prot.h | 2 ++ lib_rend/ivas_splitRendererPost.c | 8 ++++---- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 94c706fa81..94e2ae1529 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -155,6 +155,7 @@ #define FIX_881_REMOVE_LFE_ADDITION_IN_ISM /* VA: issue 881: remove LFE addition in ISM format */ #define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */ #define FIX_891_PARAMUPMIX_CLEANUP /* Dlb: issue 891: remove unneeded code from ParamUpmix */ +#define FIX_917_LCLD_WARNINGS /* Dlb: issue 917 and 918: fix LCLD codec warnings*/ /* #################### End BE switches ################################## */ diff --git a/lib_rend/ivas_NoiseGen.c b/lib_rend/ivas_NoiseGen.c index e4a24fabd8..ecd7d7b098 100644 --- a/lib_rend/ivas_NoiseGen.c +++ b/lib_rend/ivas_NoiseGen.c @@ -39,7 +39,7 @@ #include "ivas_prot_rend.h" #include "wmc_auto.h" - +#ifndef FIX_917_LCLD_WARNINGS /*------------------------------------------------------------------------------------------* * Function CreateNoiseGen() * @@ -80,7 +80,7 @@ NoiseGen *CreateNoiseGen( void ) return psNoiseGen; } - +#endif /*------------------------------------------------------------------------------------------* * Function DeleteNoiseGen() diff --git a/lib_rend/ivas_RMSEnvGrouping.c b/lib_rend/ivas_RMSEnvGrouping.c index 770165ba6f..e08b96eb2b 100644 --- a/lib_rend/ivas_RMSEnvGrouping.c +++ b/lib_rend/ivas_RMSEnvGrouping.c @@ -588,7 +588,7 @@ static float TryMerge2( return fMergedCost; } - +#ifndef FIX_917_LCLD_WARNINGS /*-------------------------------------------------------------------* * Function ComputeGreedyGroups() * @@ -650,8 +650,9 @@ static void ComputeGreedyGroups( return; } +#endif - +#ifndef FIX_917_LCLD_WARNINGS /*-------------------------------------------------------------------* * Function ComputeGreedyGroups2() * @@ -702,7 +703,7 @@ static void ComputeGreedyGroups2( return; } - +#endif /*-------------------------------------------------------------------* * Function ComputeGreedyGroups3() @@ -917,9 +918,9 @@ void ComputeEnvelopeGrouping( } /* Perform grouping via Greedy Merge */ - +#ifndef FIX_917_LCLD_WARNINGS /* ComputeGreedyGroups2( psRMSEnvelopeGrouping, iChannels, iNumBands, piBandwidths );*/ - +#endif /* Allows control over max groups can call using 16 if want same as previous call */ ComputeGreedyGroups3( psRMSEnvelopeGrouping, iChannels, iNumBands, piBandwidths, LCLD_BLOCKS_PER_FRAME ); diff --git a/lib_rend/ivas_lcld_encoder.c b/lib_rend/ivas_lcld_encoder.c index 127aaea5c8..4bc64df16a 100644 --- a/lib_rend/ivas_lcld_encoder.c +++ b/lib_rend/ivas_lcld_encoder.c @@ -483,7 +483,9 @@ static int32_t CountLCLDBits( const int32_t iNumGroups, const int32_t *piGroupLe static int32_t WriteHeaderInformation( const int32_t iNumBands, IVAS_SPLIT_REND_BITS_HANDLE pBits ); +#ifdef ENABLE_PMOD_ADJUST static int32_t WritePmodInformation( const int32_t **ppiHiSMRFlags, IVAS_SPLIT_REND_BITS_HANDLE pBits, int32_t iChannels, int32_t iNumBands ); +#endif static int32_t WriteMSInformation( const int32_t iNumBands, const int32_t iMSMode, const int32_t *piMSFlags, const int32_t *piLRPhaseDiffs, const int32_t *piMSPredCoefs, int32_t iNumMSPredBands, IVAS_SPLIT_REND_BITS_HANDLE pBits ); @@ -1198,7 +1200,7 @@ static void QuantizeSpectrumDPCM_Opt( return; } - +#ifndef FIX_917_LCLD_WARNINGS static void QuantizeSpectrumDPCM( const int32_t iNumGroups, const int32_t *piGroupLengths, @@ -1334,7 +1336,7 @@ static void QuantizeSpectrumDPCM( return; } - +#endif static int32_t CountLCLDBits( const int32_t iNumGroups, diff --git a/lib_rend/ivas_lcld_prot.h b/lib_rend/ivas_lcld_prot.h index ad35e50f00..1ff4e37e55 100644 --- a/lib_rend/ivas_lcld_prot.h +++ b/lib_rend/ivas_lcld_prot.h @@ -195,9 +195,11 @@ typedef struct NOISE_GEN float *pfNoiseBuffer; } NoiseGen; +#ifndef FIX_917_LCLD_WARNINGS NoiseGen *CreateNoiseGen( void ); +#endif void DeleteNoiseGen( NoiseGen *psNoiseGen diff --git a/lib_rend/ivas_splitRendererPost.c b/lib_rend/ivas_splitRendererPost.c index 8eb542892e..8b513f3d87 100644 --- a/lib_rend/ivas_splitRendererPost.c +++ b/lib_rend/ivas_splitRendererPost.c @@ -163,7 +163,7 @@ void ivas_splitBinPostRendClose( return; } - +#ifndef FIX_917_LCLD_WARNINGS /*-----------------------------------------------------------------------------------------* * Function ivas_huffman_code_bits_present() * @@ -195,7 +195,7 @@ static int32_t ivas_split_rend_huffman_code_bits_present( return index; } - +#endif /*-----------------------------------------------------------------------------------------* * Function ivas_split_rend_huffman_decode_opt() @@ -1161,7 +1161,7 @@ static void get_interpolation_vars( return; } - +#ifndef FIX_917_LCLD_WARNINGS /*-----------------------------------------------------------------------------------------* * Function interpolate_gain_matrix() * @@ -1212,7 +1212,7 @@ static void interpolate_gain_matrix( return; } - +#endif /*-----------------------------------------------------------------------------------------* * Function interpolate_pred_matrix() -- GitLab From a8e0ecd61f791b734d846a2e2ef644f1c645dda6 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 29 Nov 2023 10:29:27 +0100 Subject: [PATCH 2/2] remove another unused funtion --- lib_rend/ivas_RMSEnvGrouping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_rend/ivas_RMSEnvGrouping.c b/lib_rend/ivas_RMSEnvGrouping.c index e08b96eb2b..53cd3ab6b8 100644 --- a/lib_rend/ivas_RMSEnvGrouping.c +++ b/lib_rend/ivas_RMSEnvGrouping.c @@ -275,7 +275,7 @@ static void ComputeBandEnergy( return; } - +#ifndef FIX_917_LCLD_WARNINGS /*-------------------------------------------------------------------* * Function TryMerge() * @@ -375,7 +375,7 @@ static float TryMerge( return fMeanCost; } - +#endif /*-------------------------------------------------------------------* * Function ComputeMergeRMS() -- GitLab