[cleanup] accept FIX_1494_SET_SPLITBFI_UNUSED (b078199a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+0 −39

Original line number	Diff line number	Diff line
		@@ -48,9 +48,6 @@
		#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"
		@@ -170,9 +167,6 @@ 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];
		@@ -223,9 +217,6 @@ typedef enum
		CmdLnOptionId_listFormats,
		CmdLnOptionId_inputGain,
		CmdLnOptionId_outputMetadata,
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		CmdLnOptionId_SplitRendBFIFile,
		#endif
		CmdLnOptionId_referenceVectorFile,
		CmdLnOptionId_exteriorOrientationFile,
		CmdLnOptionId_framing,
		@@ -284,14 +275,6 @@ 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",
		@@ -696,9 +679,6 @@ 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;
		@@ -829,13 +809,6 @@ 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 ) )
		{
		@@ -2080,9 +2053,6 @@ 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 )
		{
		@@ -2699,9 +2669,6 @@ 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 );
		@@ -2808,12 +2775,6 @@ 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 );

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,6 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
		#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */
		#define FIX_1494_SET_SPLITBFI_UNUSED /* Dolby: Fix issue 1494, remove unused function setting BFI flag in ISAR renderer */
		#define FIX_1479_MSAN_SPAR_UNINITIALIZED_VALUE /* Dolby: Fix for issue 1479, MSAN error due to uninitialized value in SPAR */
		#define REMOVE_UNUSED_CODE_IVAS_DEC /* VA: remove unused code in ivas_jbm_dec_tc_fx() */
		#define REMOVE_CAM_FROM_IVAS /* VA: basop issue 210: remove obsoelte CAM code from IVAS */

lib_rend/lib_rend.c

+0 −28

Original line number	Diff line number	Diff line
		@@ -89,9 +89,6 @@ 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;
		@@ -215,9 +212,6 @@ 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;

		@@ -1240,9 +1234,6 @@ 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;
		@@ -5032,25 +5023,6 @@ ivas_error IVAS_REND_DisableHeadRotation(
		}


		#ifndef FIX_1494_SET_SPLITBFI_UNUSED

		/-------------------------------------------------------------------
		* IVAS_REND_SetSplitRendBFI()
		*
		*
		-------------------------------------------------------------------/

		ivas_error IVAS_REND_SetSplitRendBFI(
		IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
		const int16_t bfi /* i : bad frame indicator */
		)
		{
		hIvasRend->splitRendBFI = bfi;

		return IVAS_ERR_OK;
		}

		#endif


		/-------------------------------------------------------------------

lib_rend/lib_rend.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -338,12 +338,6 @@ 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 */

Admin message