on going masan error renderer (88faa3e4) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+23 −13

Original line number	Diff line number	Diff line
		@@ -1038,7 +1038,7 @@ int main(
		if ( ( error = IVAS_REND_GetHrtfHandle( hIvasRend, &hHrtfTD ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_GetHrtfHandle failed\n\n" );
		exit( -1 );
		goto cleanup;
		}

		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
		@@ -1046,12 +1046,12 @@ int main(
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		exit( -1 );
		goto cleanup;
		}
		else
		{
		free( hHrtfTD );
		hHrtfTD = NULL;
		free( *hHrtfTD );
		*hHrtfTD = NULL;
		}
		}

		@@ -1061,7 +1061,7 @@ int main(
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		exit( -1 );
		goto cleanup;
		}
		}
		#endif
		@@ -1069,7 +1069,7 @@ int main(
		if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed\n\n" );
		exit( -1 );
		goto cleanup;
		}

		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
		@@ -1077,14 +1077,19 @@ int main(
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		exit( -1 );
		goto cleanup;
		}
		else
		{
		free( *hSetOfHRTF );
		*hSetOfHRTF = NULL;
		}
		}

		if ( ( error = IVAS_REND_GetHrtfFastConvHandle( hIvasRend, &hHrtfFastConv ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_GetHrtfFastConvHandle failed\n\n" );
		exit( -1 );
		goto cleanup;
		}

		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfFileReader ) ) != IVAS_ERR_OK )
		@@ -1092,7 +1097,7 @@ int main(
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		exit( -1 );
		goto cleanup;
		}
		else
		{
		@@ -1104,7 +1109,7 @@ int main(
		if ( ( error = IVAS_REND_GetHrtfParamBinHandle( hIvasRend, &hHrtfParambin ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfParamBinHandle failed\n\n" );
		exit( -1 );
		goto cleanup;
		}

		if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hrtfFileReader ) ) != IVAS_ERR_OK )
		@@ -1112,7 +1117,7 @@ int main(
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		exit( -1 );
		goto cleanup;
		}
		else
		{
		@@ -2191,6 +2196,11 @@ int main(
		free( inFloatBuffer );
		free( outInt16Buffer );
		free( outFloatBuffer );

		#ifdef FIX_BINARY_BINAURAL_READING
		cleanup:
		#endif

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( bitsBufferData != NULL )
		{
		@@ -2226,11 +2236,11 @@ int main(
		hrtfFileReader_close( &hrtfFileReader );
		#endif
		#ifdef FIX_BINARY_BINAURAL_READING
		if ( hSetOfHRTF )
		if ( *hSetOfHRTF != NULL )
		{
		destroy_SetOfHRTF( *hSetOfHRTF );
		}
		if ( hHrtfTD )
		if ( hHrtfTD != NULL )
		{
		dealloc_HRTF_binary( *hHrtfTD );
		}

lib_rend/ivas_objectRenderer_mix.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ void TDREND_MIX_Dealloc(
		{
		free( hBinRendererTd->HrFiltSet_p );
		hBinRendererTd->HrFiltSet_p = NULL;
		hBinRendererTd->pHrFiltSet_p = NULL;
		*hBinRendererTd->pHrFiltSet_p = NULL;
		}
		#else
		free( hBinRendererTd->HrFiltSet_p );
		@@ -245,17 +245,14 @@ ivas_error TDREND_MIX_Init(
		return error;
		}
		*hHrtfTD = hBinRendererTd->HrFiltSet_p;
		#ifdef FIX_BINARY_BINAURAL_READING
		hBinRendererTd->pHrFiltSet_p = NULL;
		#endif
		}
		else
		{
		hBinRendererTd->HrFiltSet_p = *hHrtfTD;
		}
		#ifdef FIX_BINARY_BINAURAL_READING
		hBinRendererTd->pHrFiltSet_p = hHrtfTD;
		#endif
		}

		if ( hBinRendererTd->HrFiltSet_p->SampleRate != output_Fs )
		{