Merge branch 'main' into 30-develop-main-branch-ci-build-and-tests (9d800c81) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Workspace_msvc/lib_com.vcxproj

+3 −3

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@
		</CustomBuildStep>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<ExceptionHandling />
		<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
		@@ -109,7 +109,7 @@
		</CustomBuildStep>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<ExceptionHandling>
		</ExceptionHandling>
		@@ -147,7 +147,7 @@
		<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
		<OmitFramePointers>false</OmitFramePointers>
		<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<StringPooling>true</StringPooling>
		<ExceptionHandling />

Workspace_msvc/lib_debug.vcxproj

+5 −5

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@
		</CustomBuildStep>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<MinimalRebuild>false</MinimalRebuild>
		<ExceptionHandling />
		@@ -97,7 +97,7 @@
		</CustomBuildStep>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<MinimalRebuild>false</MinimalRebuild>
		<ExceptionHandling>
		@@ -124,7 +124,7 @@
		<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
		<IntrinsicFunctions>false</IntrinsicFunctions>
		<WholeProgramOptimization>false</WholeProgramOptimization>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<StringPooling>true</StringPooling>
		<ExceptionHandling />
		@@ -147,7 +147,7 @@
		<ClCompile Include="..\lib_debug\mem_count.c" />
		<ClCompile Include="..\lib_debug\segsnr.c" />
		<ClCompile Include="..\lib_debug\snr.c" />
		<ClCompile Include="..\lib_debug\spar_debug.c" />
		<ClCompile Include="..\lib_debug\sba_debug.c" />
		<ClCompile Include="..\lib_debug\wmops.c" />
		</ItemGroup>
		<ItemGroup>
		@@ -155,7 +155,7 @@
		<ClInclude Include="..\lib_debug\deb_out.h" />
		<ClInclude Include="..\lib_debug\errorhnd.h" />
		<ClInclude Include="..\lib_debug\mem_count.h" />
		<ClInclude Include="..\lib_debug\spar_debug.h" />
		<ClInclude Include="..\lib_debug\sba_debug.h" />
		<ClInclude Include="..\lib_debug\wmops.h" />
		</ItemGroup>
		<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Workspace_msvc/lib_enc.vcxproj

+3 −3

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@
		</Midl>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<ExceptionHandling />
		<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
		@@ -129,7 +129,7 @@
		</Midl>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<ExceptionHandling>
		</ExceptionHandling>
		@@ -176,7 +176,7 @@
		<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
		<OmitFramePointers>false</OmitFramePointers>
		<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<StringPooling>true</StringPooling>
		<ExceptionHandling />

apps/decoder.c

+12 −20

Original line number	Diff line number	Diff line
		@@ -57,13 +57,7 @@
		#include "debug.h"
		#endif
		#include "render_config_reader.h"
		#ifdef DEBUG_SBA
		#include "ivas_cnst.h"
		#include "spar_debug.h"
		int16_t numTransportChannels = 1;
		int16_t numOutChannels = 1;
		int16_t pca_ingest_channels = 1;
		#endif


		#define WMC_TOOL_MAN

		@@ -202,6 +196,9 @@ int main(
		#ifdef DEBUGGING
		int32_t noClipping;
		int32_t cnt_frames_limited;
		#ifdef DEBUG_SBA_AUDIO_DUMP
		int16_t numOutChannels, numTransportChannels, pca_ingest_channels;
		#endif
		#endif

		#ifdef WMOPS
		@@ -396,13 +393,8 @@ int main(
		}
		}

		#ifdef DEBUG_SBA
		spar_debug_t dbg_params;
		dbg_params.fs = arg.output_Fs;
		dbg_params.n_ch = numOutChannels;
		dbg_params.n_transport = numTransportChannels;
		dbg_params.pca_ingest_channels = pca_ingest_channels;
		ivas_open_decoder_debug_files( &dbg_params );
		#ifdef DEBUG_SBA_AUDIO_DUMP
		ivas_open_sba_decoder_debug_files( arg.output_Fs, 1, 1 );
		#endif

		/-----------------------------------------------------------------
		@@ -558,6 +550,10 @@ int main(

		cleanup:

		#ifdef DEBUG_SBA_AUDIO_DUMP
		IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );
		#endif

		IVAS_DEC_Close( &hIvasDec );
		CustomLsReader_close( &hLsCustomReader );
		hrtfFileReader_close( &hrtfReader );
		@@ -586,12 +582,8 @@ cleanup:
		printf( "\n" );
		}

		#ifdef DEBUG_SBA
		dbg_params.fs = arg.output_Fs;
		dbg_params.n_ch = numOutChannels;
		dbg_params.n_transport = numTransportChannels;
		dbg_params.pca_ingest_channels = pca_ingest_channels;
		ivas_close_decoder_debug_files( &dbg_params );
		#ifdef DEBUG_SBA_AUDIO_DUMP
		ivas_close_sba_decoder_debug_files( arg.output_Fs, numOutChannels, numTransportChannels, pca_ingest_channels );
		#endif
		#ifdef DEBUGGING
		dbgclose();

apps/encoder.c

+11 −29

Original line number	Diff line number	Diff line
		@@ -51,15 +51,11 @@
		#endif
		#ifdef DEBUGGING
		#include "debug.h"
		#ifdef DEBUG_SBA
		#include "ivas_cnst.h"
		#include "spar_debug.h"
		#endif
		#endif


		#define WMC_TOOL_MAN


		/------------------------------------------------------------------------------------------
		* Local constants, enums, structures
		------------------------------------------------------------------------------------------/
		@@ -219,8 +215,9 @@ int main(
		#endif

		#ifdef DEBUG_SBA
		spar_debug_t dbg_params;
		int16_t numTransportChannels = 1;
		#endif

		#ifdef WMOPS
		size_t SRAM_size = 0;
		#endif
		@@ -443,7 +440,11 @@ int main(
		}
		break;
		case IVAS_ENC_INPUT_SBA:
		#ifdef DEBUG_SBA_AUDIO_DUMP
		if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar, arg.agc, arg.pca, &numTransportChannels ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar, arg.agc, arg.pca ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_ENC_ConfigureForAmbisonics failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -559,29 +560,10 @@ int main(
		uint16_t numBits = 0;

		#ifdef DEBUG_SBA
		int16_t numInputChannels;
		if ( ( error = IVAS_ENC_GetNumInputChannels( hIvasEnc, &numInputChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nGetNumInputChannels failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;
		}
		dbg_params.agc = (int16_t) arg.agc;
		dbg_params.dtx_on = (int16_t) arg.dtxConfig.enabled;
		dbg_params.file_tag = arg.dbg_file_tag;
		dbg_params.ivas_total_brate = arg.initBitrate;
		dbg_params.fs = arg.inputFs;
		dbg_params.n_ch = numInputChannels;
		int16_t numTransportChannels;
		if ( ( error = getTransportChannel( hIvasEnc, &numTransportChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nGetNumInputChannels failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;
		}
		dbg_params.n_transport = numTransportChannels;
		#ifdef DEBUG_AGC
		ivas_open_agc_debug_files( &dbg_params );
		ivas_open_agc_debug_files( (int16_t) arg.agc );
		#endif
		ivas_open_debug_files( &dbg_params );
		ivas_open_sba_encoder_debug_files( arg.inputFs, numTransportChannels, arg.dbg_file_tag, arg.initBitrate, (int16_t) arg.dtxConfig.enabled );
		#endif

		if ( !arg.quietModeEnabled )
		@@ -847,9 +829,9 @@ cleanup:
		#endif

		#ifdef DEBUG_SBA
		ivas_close_remove_debug_files();
		ivas_close_sba_encoder_debug_files();
		#ifdef DEBUG_AGC
		ivas_close_agc_debug_files( &io_params );
		ivas_close_agc_debug_files();
		#endif
		#endif