fix formating (6542296d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+3 −13

Original line number	Diff line number	Diff line
		@@ -714,8 +714,8 @@ int main(
		{
		#ifndef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

		#endif

		if ( ( error = IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -730,13 +730,11 @@ int main(
		#ifdef FIX_OLD_BINARY_FORMAT
		hrtfFileReader_close( &hrtfReader );
		strcat( arg.hrtfFileName, "new" );

		if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}

		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -746,11 +744,7 @@ int main(
		}
		else
		{
		if ( ( error = destroy_td_hrtf( hHrtfTD ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\ndestroy_td_hrtf() failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		destroy_td_hrtf( hHrtfTD );
		}
		}
		#else
		@@ -760,11 +754,7 @@ int main(
		}
		else
		{
		if ( ( error = destroy_td_hrtf( hHrtfTD ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\ndestroy_td_hrtf() failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		destroy_td_hrtf( hHrtfTD );
		}
		}
		#else

apps/renderer.c

+3 −16

Original line number	Diff line number	Diff line
		@@ -810,7 +810,6 @@ int main(
		cldfb_in_flag = 0;
		#endif
		#endif

		for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )
		{
		lfeRoutingConfigs[i] = NULL;
		@@ -892,8 +891,8 @@ int main(
		exit( -1 );
		}
		}

		#endif

		if ( !isEmptyString( args.renderConfigFilePath ) )
		{
		if ( RenderConfigReader_open( args.renderConfigFilePath, &renderConfigReader ) != IVAS_ERR_OK )
		@@ -1052,13 +1051,11 @@ int main(
		#ifdef FIX_OLD_BINARY_FORMAT
		hrtfFileReader_close( &hrtfFileReader );
		strcat( args.customHrtfFilePath, "new" );

		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		goto cleanup;
		}

		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -1068,11 +1065,7 @@ int main(
		}
		else
		{
		if ( ( error = destroy_td_hrtf( hHrtfTD ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\ndestroy_td_hrtf() failed: \n\n" /, IVAS_DEC_GetErrorMessage( error )/ );
		goto cleanup;
		}
		destroy_td_hrtf( hHrtfTD );
		}
		}
		#else
		@@ -1082,11 +1075,7 @@ int main(
		}
		else
		{
		if ( ( error = destroy_td_hrtf( hHrtfTD ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\ndestroy_td_hrtf() failed: \n\n" /, IVAS_DEC_GetErrorMessage( error )/ );
		goto cleanup;
		}
		destroy_td_hrtf( hHrtfTD );
		}
		}

		@@ -1174,7 +1163,6 @@ int main(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		CLDFBframeSize_smpls = 0;
		cldfb_in_flag = 0;

		#endif
		#endif
		if ( args.renderConfigFilePath[0] != '\0' )
		@@ -2248,7 +2236,6 @@ cleanup:
		free( bitsBufferData );
		}
		#endif

		for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )
		{
		MasaFileReader_close( &masaReaders[i] );

lib_com/ivas_prot.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -2925,8 +2925,8 @@ void set_zero_l(
		float vec, / o : input vector */
		const uint32_t lvec /* i : length of the vector */
		);

		#endif

		ivas_error stereo_memory_enc(
		CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
		const int32_t input_Fs, /* i : input sampling rate */

lib_com/ivas_tools.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -579,7 +579,6 @@ int16_t check_bounds_s(
		return value_adj;
		}


		#ifdef FIX_CRASH_LONG_BRIR
		/---------------------------------------------------------------------
		* set_zero_l()
		@@ -603,7 +602,6 @@ void set_zero_l(
		}
		#endif


		/****************************************************************************/
		/* matrix functions */
		/* matrices are ordered column-wise in memory */

lib_rend/ivas_objectRenderer_mix.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,6 @@ ivas_error TDREND_MIX_Init(
		{
		hBinRendererTd->HrFiltSet_p = *hHrtfTD;
		}

		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		hBinRendererTd->pHrFiltSet_p = hHrtfTD;
		#endif