From 962eb0cf67e21011c749f6c79563374e1be29b5a Mon Sep 17 00:00:00 2001 From: "Malenovsky, Vladimir" Date: Mon, 26 Jan 2026 11:01:56 +0100 Subject: [PATCH 1/3] remove obsolete ISAR-related functions, improve error messages and formatting --- lib_com/options.h | 1 + lib_isar/isar_PredDecoder.c | 4 ++-- lib_isar/isar_RMSEnvGrouping.c | 8 ++++---- lib_isar/isar_lcld_decoder.c | 2 +- lib_isar/isar_lcld_encoder.c | 7 +++---- lib_isar/isar_lcld_prot.h | 2 ++ lib_isar/lib_isar_post_rend.c | 3 --- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 42a41806b2..f297a9dee0 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -165,6 +165,7 @@ #define FIX_2344_ALIGN_PREPROC /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */ #define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */ #define FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE /* FhG: Fix issue 2331: Uninitialized variable */ +#define FIX_2371_REMOVE_UNUSED_ISAR_FCNS /* Dolby: basop issue 2371: remove unused ISAR-related functions */ /* #################### End BE switches ################################## */ diff --git a/lib_isar/isar_PredDecoder.c b/lib_isar/isar_PredDecoder.c index 24f266b100..7a87c1f367 100644 --- a/lib_isar/isar_PredDecoder.c +++ b/lib_isar/isar_PredDecoder.c @@ -342,7 +342,7 @@ int16_t ReadPredictors( return iBitsRead; } - +#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS /*-------------------------------------------------------------------* * Function SetDecodingPassed() * @@ -363,7 +363,7 @@ void SetDecodingPassed( return; } - +#endif /*-------------------------------------------------------------------* * Function AnyDecodingUnresolved() diff --git a/lib_isar/isar_RMSEnvGrouping.c b/lib_isar/isar_RMSEnvGrouping.c index c40842d39a..346feb4d6a 100644 --- a/lib_isar/isar_RMSEnvGrouping.c +++ b/lib_isar/isar_RMSEnvGrouping.c @@ -622,8 +622,8 @@ static void LimitRMSEnvelope( if ( iDelta > iRMSDeltaMax ) { -#ifdef DEBUG_VERBOSE - printf( "WARNING RMS envelope delta limited\n" ); +#ifdef DEBUGGING + printf( "Warning: RMS envelope delta limited!\n" ); #endif piRMSEnvelope[iBand] += ( iDelta - iRMSDeltaMax ); } @@ -641,8 +641,8 @@ static void LimitRMSEnvelope( if ( iDelta < iRMSDeltaMin ) { -#ifdef DEBUG_VERBOSE - printf( "WARNING RMS envelope delta limited\n" ); +#ifdef DEBUGGING + printf( "Warning: RMS envelope delta limited!\n" ); #endif piRMSEnvelope[iBand] += ( iRMSDeltaMin - iDelta ); } diff --git a/lib_isar/isar_lcld_decoder.c b/lib_isar/isar_lcld_decoder.c index 148ee523eb..a58fff9b8b 100644 --- a/lib_isar/isar_lcld_decoder.c +++ b/lib_isar/isar_lcld_decoder.c @@ -1425,7 +1425,7 @@ static int32_t ReadMSInformation( } else { - printf( "ERROR UNSUPPORTED MS MODE\n" ); + printf( "Error in ReadMSInformation() - unsupported MS mode information!\n" ); } return iBitsRead; diff --git a/lib_isar/isar_lcld_encoder.c b/lib_isar/isar_lcld_encoder.c index 880a3c30fb..fac582b02b 100644 --- a/lib_isar/isar_lcld_encoder.c +++ b/lib_isar/isar_lcld_encoder.c @@ -1621,7 +1621,7 @@ static int32_t WriteAllocInformation( if ( iAllocOffset < MIN_ALLOC_OFFSET || iAllocOffset > MAX_ALLOC_OFFSET ) { - printf( "Serious error\n" ); + printf( "Error in WriteAllocInformation() - iAllocOffset has incorrect value: %d!\n", iAllocOffset\n" ); } ISAR_SPLIT_REND_BITStream_write_int32( pBits, ( iAllocOffset - MIN_ALLOC_OFFSET ), ALLOC_OFFSET_BITS ); @@ -1849,10 +1849,9 @@ static int32_t ComputeAllocation( if ( *piAllocOffset <= MIN_ALLOC_OFFSET && iBitsUsed > iAvailableBits ) { -#ifdef DEBUG_VERBOSE - printf( "Frame can not be coded with the number of bits available\n" ); +#ifdef DEBUGGING + printf( "Error in ComputeAllocation() - frame can not be coded with the number of bits available!\n" ); #endif - /* iLastError = ENC_ERROR_STREAM_FAILURE;*/ return -1; } else if ( *piAllocOffset >= MAX_ALLOC_OFFSET && iBitsUsed < iAvailableBits ) diff --git a/lib_isar/isar_lcld_prot.h b/lib_isar/isar_lcld_prot.h index 4296ffc7e3..a61b9e68d4 100644 --- a/lib_isar/isar_lcld_prot.h +++ b/lib_isar/isar_lcld_prot.h @@ -313,8 +313,10 @@ int16_t GetNumSubSets( int32_t **GetDecodingFailedPrevStatus( LCLDDecoder *psLCLDDecoder); +#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS void SetDecodingPassed( PredictionDecoder *psPredictionDecoder); +#endif void UpdateDecodingUnresolved( PredictionDecoder *psPredictionDecoder); diff --git a/lib_isar/lib_isar_post_rend.c b/lib_isar/lib_isar_post_rend.c index 276365592f..fa005a2dea 100644 --- a/lib_isar/lib_isar_post_rend.c +++ b/lib_isar/lib_isar_post_rend.c @@ -770,7 +770,6 @@ ivas_error ISAR_POST_REND_SetInputGain( if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputBase ) ) != IVAS_ERR_OK ) { - printf( "Hoo\n" ); return error; } @@ -1058,7 +1057,6 @@ ivas_error ISAR_POST_REND_FeedInputAudio( if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputBase ) ) != IVAS_ERR_OK ) { - printf( "Foo\n" ); return error; } @@ -1181,7 +1179,6 @@ ivas_error ISAR_POST_REND_FeedSplitBinauralBitstream( if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputBase ) ) != IVAS_ERR_OK ) { - printf( "Goo\n" ); return error; } -- GitLab From 4324eddf8da62f26342afce2303150c931907868 Mon Sep 17 00:00:00 2001 From: "Malenovsky, Vladimir" Date: Mon, 26 Jan 2026 14:17:29 +0100 Subject: [PATCH 2/3] small fix --- lib_isar/isar_lcld_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_isar/isar_lcld_encoder.c b/lib_isar/isar_lcld_encoder.c index fac582b02b..20b8738286 100644 --- a/lib_isar/isar_lcld_encoder.c +++ b/lib_isar/isar_lcld_encoder.c @@ -1621,7 +1621,7 @@ static int32_t WriteAllocInformation( if ( iAllocOffset < MIN_ALLOC_OFFSET || iAllocOffset > MAX_ALLOC_OFFSET ) { - printf( "Error in WriteAllocInformation() - iAllocOffset has incorrect value: %d!\n", iAllocOffset\n" ); + printf( "Error in WriteAllocInformation() - iAllocOffset has incorrect value: %d!\n", iAllocOffset" ); } ISAR_SPLIT_REND_BITStream_write_int32( pBits, ( iAllocOffset - MIN_ALLOC_OFFSET ), ALLOC_OFFSET_BITS ); -- GitLab From 1706b0f8443211cbe9a5abe11735fde69e884f7a Mon Sep 17 00:00:00 2001 From: "Malenovsky, Vladimir" Date: Mon, 26 Jan 2026 14:20:09 +0100 Subject: [PATCH 3/3] small fix --- lib_isar/isar_lcld_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_isar/isar_lcld_encoder.c b/lib_isar/isar_lcld_encoder.c index 20b8738286..ca02818448 100644 --- a/lib_isar/isar_lcld_encoder.c +++ b/lib_isar/isar_lcld_encoder.c @@ -1621,7 +1621,7 @@ static int32_t WriteAllocInformation( if ( iAllocOffset < MIN_ALLOC_OFFSET || iAllocOffset > MAX_ALLOC_OFFSET ) { - printf( "Error in WriteAllocInformation() - iAllocOffset has incorrect value: %d!\n", iAllocOffset" ); + printf( "Error in WriteAllocInformation() - iAllocOffset has incorrect value: %d!\n", iAllocOffset ); } ISAR_SPLIT_REND_BITStream_write_int32( pBits, ( iAllocOffset - MIN_ALLOC_OFFSET ), ALLOC_OFFSET_BITS ); -- GitLab