[cleanup] accept FIX_1225_DISCLAIMER (964309a3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -737,10 +737,8 @@ int main(
		lfeRoutingConfigs[i] = NULL;
		}

		#ifdef FIX_1225_DISCLAIMER
		IVAS_REND_PrintDisclaimer();

		#endif
		CmdlnArgs args = parseCmdlnArgs( argc, argv );

		if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) \|\|
		@@ -898,7 +896,6 @@ int main(
		exit( -1 );
		}

		#ifdef FIX_1225_DISCLAIMER
		fprintf( stdout, "Input audio file: %s\n", args.inputFilePath );
		fprintf( stdout, "Output audio file: %s\n\n", args.outputFilePath );

		@@ -940,7 +937,6 @@ int main(
		goto cleanup;
		}

		#endif
		if ( !isEmptyString( args.customHrtfFilePath ) )
		{
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )

lib_com/disclaimer.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -47,11 +47,7 @@ int16_t print_disclaimer( FILE *fPtr )
		{

		fprintf( fPtr, "\n==================================================================================================\n" );
		#ifdef FIX_1225_DISCLAIMER
		fprintf( fPtr, " \n IVAS Codec Version IVAS-FL-2.0\n" );
		#else
		fprintf( fPtr, " IVAS Codec Baseline\n" );
		#endif
		fprintf( fPtr, " \n" );
		fprintf( fPtr, " Based on EVS Codec (Floating Point) 3GPP TS26.443 Nov 04, 2021,\n" );
		fprintf( fPtr, " Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0\n" );

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,6 @@

		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
		#define FIX_1225_DISCLAIMER /* VA: issue 1225: Add disclaimer for external renderer + Add info about IVAS reference version */
		#define FIX_1179_USAN_PHASEECU /* Eri: issue 1179: better handling of 16 bit wrap around for very long(>200ms) FER-bursts */
		#define FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX /* VA: issue 1249: remove obsolete code around ALLRAD decoder matrix */
		#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */

lib_dec/lib_dec.c

+0 −90

Original line number	Diff line number	Diff line
		@@ -43,9 +43,6 @@
		#include "jbm_pcmdsp_fifo.h"
		#include <math.h>
		#include <assert.h>
		#ifndef FIX_1225_DISCLAIMER
		#include <string.h>
		#endif
		#ifdef DEBUGGING
		#include "debug.h"
		#endif
		@@ -3913,93 +3910,6 @@ const char *IVAS_DEC_GetErrorMessage(
		return ivas_error_to_string( error );
		}

		#ifndef FIX_1225_DISCLAIMER
		/---------------------------------------------------------------------
		* get_channel_config()
		*
		* Gets a str related to input config
		---------------------------------------------------------------------/

		static ivas_error get_channel_config(
		AUDIO_CONFIG config,
		char *str )
		{
		if ( config == IVAS_AUDIO_CONFIG_MONO )
		{
		strcpy( str, "Mono" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_STEREO )
		{
		strcpy( str, "Stereo" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_5_1 )
		{
		strcpy( str, "Multichannel 5.1 (CICP6)" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_7_1 )
		{
		strcpy( str, "Multichannel 7.1 (CICP12)" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_5_1_2 )
		{
		strcpy( str, "Multichannel 5.1+2 (CICP14)" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_5_1_4 )
		{
		strcpy( str, "Multichannel 5.1+4 (CICP16)" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_7_1_4 )
		{
		strcpy( str, "Multichannel 7.1+4 (CICP19)" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_LS_CUSTOM )
		{
		strcpy( str, "Multichannel (custom loudspeaker layout)" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_FOA )
		{
		strcpy( str, "Ambisonics: First Order (FOA)" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_HOA2 )
		{
		strcpy( str, "Ambisonics: Second Order (HOA2)" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_HOA3 )
		{
		strcpy( str, "Ambisonics: Third Order (HOA3)" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_BINAURAL )
		{
		strcpy( str, "Binaural: no room" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )
		{
		strcpy( str, "Binaural: room with impulse responses" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		strcpy( str, "Binaural: room with reverb" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )
		{
		strcpy( str, "BINAURAL_SPLIT_CODED" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		strcpy( str, "Binaural_Split_PCM" );
		}
		else if ( config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		strcpy( str, "External renderer" );
		}
		else
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Error: Incorrect Input/Output Configuration" );
		}

		return IVAS_ERR_OK;
		}
		#endif

		/---------------------------------------------------------------------
		* printConfigInfo_dec( )

lib_rend/ivas_output_init.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -37,9 +37,7 @@
		#include "ivas_prot_rend.h"
		#include "ivas_rom_com.h"
		#include "ivas_prot.h"
		#ifdef FIX_1225_DISCLAIMER
		#include <string.h>
		#endif
		#ifdef DEBUGGING
		#include "debug.h"
		#include <assert.h>
		@@ -480,7 +478,6 @@ int16_t is_split_rendering_enabled(
		}
		}

		#ifdef FIX_1225_DISCLAIMER

		/---------------------------------------------------------------------
		* get_channel_config()
		@@ -591,4 +588,3 @@ ivas_error get_channel_config(

		return IVAS_ERR_OK;
		}
		#endif