From 672aaff4ace47137dae9f4b84f65b651dad2efc9 Mon Sep 17 00:00:00 2001 From: "Malenovsky, Vladimir" Date: Fri, 9 Jan 2026 14:29:02 +0100 Subject: [PATCH 1/2] removal of unused code --- apps/renderer.c | 16 ++++++++++++++++ lib_com/options.h | 1 + lib_rend/lib_rend.c | 10 ++++++++++ lib_rend/lib_rend.h | 2 ++ 4 files changed, 29 insertions(+) diff --git a/apps/renderer.c b/apps/renderer.c index 7af468b9e6..503b9ac774 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -168,7 +168,9 @@ typedef struct int16_t numInMetadataFiles; char outMetadataFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; +#ifndef FIX_1494_SET_SPLITBFI_UNUSED char splitRendBFIFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; +#endif char referenceVectorFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; char externalOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; @@ -219,7 +221,9 @@ typedef enum CmdLnOptionId_listFormats, CmdLnOptionId_inputGain, CmdLnOptionId_outputMetadata, +#ifndef FIX_1494_SET_SPLITBFI_UNUSED CmdLnOptionId_SplitRendBFIFile, +#endif CmdLnOptionId_referenceVectorFile, CmdLnOptionId_exteriorOrientationFile, CmdLnOptionId_framing, @@ -278,12 +282,14 @@ static const CmdLnParser_Option cliOptions[] = { .matchShort = "om", .description = "coded metadata file for BINAURAL_SPLIT_PCM output mode", }, +#ifndef FIX_1494_SET_SPLITBFI_UNUSED { .id = CmdLnOptionId_SplitRendBFIFile, .match = "post_rend_bfi_file", .matchShort = "prbfi", .description = "Split rendering option: bfi file", }, +#endif { .id = CmdLnOptionId_refRotFile, .match = "reference_rotation_file", @@ -688,7 +694,9 @@ int main( IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[RENDERER_MAX_INPUT_CHANNELS]; IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[RENDERER_MAX_INPUT_CHANNELS]; int16_t cldfb_in_flag, CLDFBframeSize_smpls; +#ifndef FIX_1494_SET_SPLITBFI_UNUSED SplitRendBFIFileReader *splitRendBFIReader = NULL; +#endif Vector3PairFileReader *referenceVectorReader = NULL; hrtfFileReader *hrtfFileReader = NULL; IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL; @@ -819,11 +827,13 @@ int main( } } +#ifndef FIX_1494_SET_SPLITBFI_UNUSED if ( !isEmptyString( args.splitRendBFIFilePath ) ) { convert_backslash( args.splitRendBFIFilePath ); SplitRendBFIFileReader_open( args.splitRendBFIFilePath, &splitRendBFIReader ); } +#endif if ( !isEmptyString( args.externalOrientationFilePath ) ) { @@ -2072,7 +2082,9 @@ cleanup: } split_rend_reader_writer_close( &hSplitRendFileReadWrite ); +#ifndef FIX_1494_SET_SPLITBFI_UNUSED SplitRendBFIFileReader_close( &splitRendBFIReader ); +#endif for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i ) { @@ -2682,7 +2694,9 @@ static CmdlnArgs defaultArgs( clearString( args.headRotationFilePath ); clearString( args.outMetadataFilePath ); +#ifndef FIX_1494_SET_SPLITBFI_UNUSED clearString( args.splitRendBFIFilePath ); +#endif clearString( args.referenceVectorFilePath ); clearString( args.referenceRotationFilePath ); clearString( args.customHrtfFilePath ); @@ -2789,10 +2803,12 @@ static void parseOption( assert( numOptionValues == 1 ); strncpy( args->outMetadataFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); break; +#ifndef FIX_1494_SET_SPLITBFI_UNUSED case CmdLnOptionId_SplitRendBFIFile: assert( numOptionValues == 1 ); strncpy( args->splitRendBFIFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); break; +#endif case CmdLnOptionId_referenceVectorFile: assert( numOptionValues == 1 ); strncpy( args->referenceVectorFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); diff --git a/lib_com/options.h b/lib_com/options.h index 08c4d0f8f9..e8ba805e43 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -183,6 +183,7 @@ #define FIX_1827_REMOVE_UNUSED_PSNOISEGEN_ISAR /* Dolby: remove unused noise generator from ISAR */ #define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX /* FhG/VA: init nb_bits_metadata to zero */ #define FIX_1477_OOB_INDEX_IN_D_ACELP_INDEXING /* FhG: fix oob indexing */ +#define FIX_1494_SET_SPLITBFI_UNUSED /* Dolby: Fix issue 1494, remove unused function setting BFI flag in ISAR renderer */ /* #################### End BE switches ################################## */ diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index 0dc0023627..be7d4ff601 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -89,7 +89,9 @@ typedef struct const EFAP_WRAPPER *pEfapOutWrapper; const IVAS_REND_HeadRotData *pHeadRotData; const RENDER_CONFIG_HANDLE *hhRendererConfig; +#ifndef FIX_1494_SET_SPLITBFI_UNUSED const int16_t *pSplitRendBFI; +#endif const SPLIT_REND_WRAPPER *pSplitRendWrapper; const COMBINED_ORIENTATION_HANDLE *pCombinedOrientationData; const IVAS_DefaultReverbSize *pSelectedRoomReverbSize; @@ -213,7 +215,9 @@ struct IVAS_REND EFAP_WRAPPER efapOutWrapper; IVAS_LSSETUP_CUSTOM_STRUCT customLsOut; +#ifndef FIX_1494_SET_SPLITBFI_UNUSED int16_t splitRendBFI; +#endif SPLIT_REND_WRAPPER *splitRendWrapper; IVAS_REND_AudioBuffer splitRendEncBuffer; @@ -1236,7 +1240,9 @@ static rendering_context getRendCtx( ctx.pEfapOutWrapper = &hIvasRend->efapOutWrapper; ctx.pHeadRotData = &hIvasRend->headRotData; ctx.hhRendererConfig = &hIvasRend->hRendererConfig; +#ifndef FIX_1494_SET_SPLITBFI_UNUSED ctx.pSplitRendBFI = &hIvasRend->splitRendBFI; +#endif ctx.pSplitRendWrapper = hIvasRend->splitRendWrapper; ctx.pCombinedOrientationData = &hIvasRend->hCombinedOrientationData; ctx.pSelectedRoomReverbSize = &hIvasRend->selectedRoomReverbSize; @@ -5059,6 +5065,8 @@ ivas_error IVAS_REND_DisableHeadRotation( } +#ifndef FIX_1494_SET_SPLITBFI_UNUSED + /*-------------------------------------------------------------------* * IVAS_REND_SetSplitRendBFI() * @@ -5075,6 +5083,8 @@ ivas_error IVAS_REND_SetSplitRendBFI( return IVAS_ERR_OK; } +#endif + /*-------------------------------------------------------------------* * IVAS_REND_SetOrientationTrackingMode() diff --git a/lib_rend/lib_rend.h b/lib_rend/lib_rend.h index 8ab8f33f1c..2ea4a222b7 100644 --- a/lib_rend/lib_rend.h +++ b/lib_rend/lib_rend.h @@ -338,10 +338,12 @@ ivas_error IVAS_REND_SetReferenceVector( const IVAS_VECTOR3 refPos /* i : Reference position */ ); +#ifndef FIX_1494_SET_SPLITBFI_UNUSED ivas_error IVAS_REND_SetSplitRendBFI( IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ const int16_t bfi /* i : bad frame indicator */ ); +#endif ivas_error IVAS_REND_SetExternalOrientation( IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ -- GitLab From 658e9e9d9ba59d6f7888fa68d2c2f8bf7fcd6d78 Mon Sep 17 00:00:00 2001 From: "Malenovsky, Vladimir" Date: Mon, 12 Jan 2026 09:53:13 +0100 Subject: [PATCH 2/2] remove unused include --- apps/renderer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/renderer.c b/apps/renderer.c index 503b9ac774..f7a9a9dd16 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -48,7 +48,9 @@ #include "rotation_file_reader.h" #include "aeid_file_reader.h" #include "split_render_file_read_write.h" +#ifndef FIX_1494_SET_SPLITBFI_UNUSED #include "split_rend_bfi_file_reader.h" +#endif #include "vector3_pair_file_reader.h" #ifdef DEBUGGING #include "debug.h" -- GitLab