Merge remote-tracking branch 'remotes/origin/main' into tabs2spaces (9caf5592) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_com.vcxproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,6 @@
		<ClCompile Include="..\lib_com\fill_spectrum_fx.c" />
		<ClCompile Include="..\lib_com\findpulse_fx.c" />
		<ClCompile Include="..\lib_com\fine_gain_bits_fx.c" />
		<ClCompile Include="..\lib_com\float_to_fix_ops.c" />
		<ClCompile Include="..\lib_com\frame_ener_fx.c" />
		<ClCompile Include="..\lib_com\gain_inov_fx.c" />
		<ClCompile Include="..\lib_com\get_gain_fx.c" />

Workspace_msvc/lib_com.vcxproj.filters

+0 −3

Original line number	Diff line number	Diff line
		@@ -256,9 +256,6 @@
		<ClCompile Include="..\lib_com\fine_gain_bits_fx.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\float_to_fix_ops.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\frame_ener_fx.c">
		<Filter>common_all_c</Filter>
		</ClCompile>

Workspace_msvc/lib_util.vcxproj

+3 −1

Original line number	Diff line number	Diff line
		@@ -109,6 +109,7 @@
		<ClCompile Include="..\lib_util\cmdln_parser.c" />
		<ClCompile Include="..\lib_util\cmdl_tools.c" />
		<ClCompile Include="..\lib_util\evs_rtp_payload.c" />
		<ClCompile Include="..\lib_util\float_to_fix_ops.c" />
		<ClCompile Include="..\lib_util\g192.c" />
		<ClCompile Include="..\lib_util\ivas_bpool.c" />
		<ClCompile Include="..\lib_util\ivas_queue.c" />
		@@ -141,6 +142,7 @@
		<ClInclude Include="..\lib_util\cmdln_parser.h" />
		<ClInclude Include="..\lib_util\cmdl_tools.h" />
		<ClInclude Include="..\lib_util\evs_rtp_payload.h" />
		<ClInclude Include="..\lib_util\float_to_fix_ops.h" />
		<ClInclude Include="..\lib_util\g192.h" />
		<ClInclude Include="..\lib_util\ivas_bpool.h" />
		<ClInclude Include="..\lib_util\ivas_queue.h" />

apps/decoder.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		*******************************************************************************************************/

		#include "lib_dec.h"
		#include "options.h"
		#include <string.h>
		#include "cmdl_tools.h"
		#include "audio_file_writer.h"
		@@ -50,7 +51,6 @@
		#include "obj_edit_file_reader.h"
		#include "vector3_pair_file_reader.h"
		#include "wmc_auto.h"
		#include "options.h"
		#include "stl.h"
		#ifdef IVAS_RTPDUMP
		#include "ivas_rtp_file.h"
		@@ -1787,12 +1787,11 @@ static void usage_dec( void )
		fprintf( stdout, " ID and duration pairs, where duration is specified in frames\n" );
		fprintf( stdout, " for BINAURAL_ROOM_REVERB output configuration.\n" );
		fprintf( stdout, "-obj_edit File : Object editing instructions file or NULL for built-in example\n" );

		fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );
		fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );
		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		fprintf( stdout, "-room_size (S\|M\|L) : Selects default reverb based on a room size (S - small \| M - medium \| L - large)\n" );
		fprintf( stdout, " for BINAURAL_ROOM_REVERB output configuration,\n" );
		fprintf( stdout, " for BINAURAL_ROOM_REVERB output configuration\n" );
		#endif
		fprintf( stdout, "-q : Quiet mode, no frame counter\n" );
		fprintf( stdout, " default is deactivated\n" );

apps/renderer.c

+0 −31

Original line number	Diff line number	Diff line
		@@ -76,9 +76,7 @@
		#define IVAS_MAX16B_FX 32767
		#define IVAS_MIN16B_FX ( -32768 )

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		#define OMASA_TDREND_MATCHING_GAIN_DB ( -2.0f )
		#endif

		#if !defined( DEBUGGING ) && !defined( WMOPS )
		static
		@@ -665,7 +663,6 @@ static void setupWithSingleFormatInput(
		positionProvider->numObjects = args.inConfig.numAudioObjects;
		for ( int16_t i = 0; i < positionProvider->numObjects; ++i )
		{
		#ifdef FIX_1376_MISSING_ISM_METADATA
		/* Check if path to metadata file was given */
		if ( isEmptyString( args.inMetadataFilePaths[i] ) )
		{
		@@ -674,18 +671,11 @@ static void setupWithSingleFormatInput(
		}

		/* It is allowed on CLI to have no metadata for an ISM input - skip opening if string contains "NULL" */
		#else
		/* It is allowed on CLI to have no metadata for an ISM input - skip opening if string is empty or contains "NULL" */
		#endif
		char charBuf[FILENAME_MAX];
		strncpy( charBuf, args.inMetadataFilePaths[i], min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1 );
		charBuf[min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1] = '\0';
		to_upper( charBuf );
		#ifdef FIX_1376_MISSING_ISM_METADATA
		if ( strncmp( charBuf, "NULL", 4 ) == 0 )
		#else
		if ( isEmptyString( args.inMetadataFilePaths[i] ) \|\| strncmp( charBuf, "NULL", 4 ) == 0 )
		#endif
		{
		continue;
		}
		@@ -1304,30 +1294,22 @@ int main(
		}
		}

		#ifndef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the total number of objects */
		#endif
		if ( args.inConfig.numAudioObjects > 0 )
		{
		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the total number of objects */
		#endif
		if ( ( error = IVAS_REND_SetTotalNumberOfObjects( hIvasRend, args.inConfig.numAudioObjects ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_SetTotalNumberOfObjects(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the metadata delay for objects */
		#endif
		IF( ( error = IVAS_REND_SetIsmMetadataDelay( hIvasRend, args.syncMdDelay ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_SetIsmMetadataDelay(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS

		/* For OMASA input and BINAURAL output, apply a gain to objects to match the loudness with MASA part */
		if ( args.inConfig.numMasaBuses > 0 && args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL )
		@@ -1337,7 +1319,6 @@ int main(
		args.inConfig.audioObjects[i].gain_dB += OMASA_TDREND_MATCHING_GAIN_DB;
		}
		}
		#endif
		}

		IVAS_REND_LfePanMtx lfePanMatrix;
		@@ -1373,7 +1354,6 @@ int main(
		{
		masaIds[i] = 0u;
		}
		#ifdef NONBE_1377_REND_DIRATT_CONF
		#ifdef FIX_1377_HANDLE_ERROR_CODE
		if ( ( error = IVAS_REND_SetObjectIDs( hIvasRend ) ) != IVAS_ERR_OK )
		{
		@@ -1382,7 +1362,6 @@ int main(
		}
		#else
		IVAS_REND_SetObjectIDs( hIvasRend );
		#endif
		#endif

		for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )
		@@ -3893,20 +3872,10 @@ static void parseCombinedFormatInput(
		inConfig->numAmbisonicsBuses = 1;
		inConfig->ambisonicsBuses[0].audioConfig = audioConfig;
		inConfig->ambisonicsBuses[0].inputChannelIndex = inConfig->numAudioObjects;
		#ifdef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		inConfig->ambisonicsBuses[0].gain_dB = 0.f;
		#else
		inConfig->ambisonicsBuses[0].gain_dB = -6.f;
		#endif
		*configString += 4;

		/* Modify input gain for objects too */
		#ifndef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		for ( int16_t i = 0; i < inConfig->numAudioObjects; ++i )
		{
		inConfig->audioObjects[i].gain_dB = -6.f;
		}
		#endif
		}
		else if ( audioConfig == IVAS_AUDIO_CONFIG_MASA1 \|\| audioConfig == IVAS_AUDIO_CONFIG_MASA2 )
		{