Merge branch '815-prepare-framework-for-wmc_tool' into 'main' (701003c4) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_com.vcxproj

+2 −0

Original line number	Diff line number	Diff line
		@@ -388,8 +388,10 @@
		<ClInclude Include="..\lib_com\cnst.h" />
		<ClInclude Include="..\lib_com\common_api_types.h" />
		<ClInclude Include="..\lib_com\control.h" />
		<ClInclude Include="..\lib_com\count.h" />
		<ClInclude Include="..\lib_com\enh1632.h" />
		<ClInclude Include="..\lib_com\enh40.h" />
		<ClInclude Include="..\lib_com\enhUL32.h" />
		<ClInclude Include="..\lib_com\ivas_cnst.h" />
		<ClInclude Include="..\lib_com\ivas_error.h" />
		<ClInclude Include="..\lib_com\ivas_error_utils.h" />

Workspace_msvc/lib_com.vcxproj.filters

+6 −0

Original line number	Diff line number	Diff line
		@@ -597,6 +597,12 @@
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\prot_fx.h" />
		<ClInclude Include="..\lib_com\count.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\enhUL32.h">
		<Filter>common_h</Filter>
		</ClInclude>
		</ItemGroup>
		<ItemGroup>
		<Filter Include="common_evs_c">

apps/decoder.c

+21 −39

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@
		#include "rotation_file_reader.h"
		#include "vector3_pair_file_reader.h"
		#include "wmc_auto.h"
		#include "options.h"
		#include "stl.h"


		@@ -54,7 +55,7 @@
		* Local constants
		------------------------------------------------------------------------------------------/

		#if !defined( DEBUGGING ) && !defined( WMOPS_FLT )
		#if !defined( DEBUGGING ) && !defined( WMOPS )
		static
		#endif
		int32_t frame = 0; /* Counter of frames */
		@@ -161,15 +162,11 @@ int main(
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		int16_t run_unit_tests = 0;

		#ifdef WMOPS_FLT
		#ifdef WMOPS
		reset_wmops();
		reset_mem( USE_BYTES );
		#endif
		#if ( WMOPS )
		#ifndef DONT_COUNT
		BASOP_init
		#endif
		#endif

		/------------------------------------------------------------------------------------------
		* Parse command-line arguments
		------------------------------------------------------------------------------------------/
		@@ -611,11 +608,7 @@ int main(
		mainFailed = false; /* This will stay set to true if cleanup is reached via a goto due to an error */

		cleanup:
		#ifndef DONT_COUNT
		/* end of WMOPS counting */
		BASOP_end
		BASOP_end_noprint
		#endif

		free( pcmBuf );

		if ( arg.hrtfReaderEnabled )
		@@ -642,10 +635,11 @@ cleanup:
		fprintf( stderr, "\nError while closing file: %s\nContinuing...\n\n", arg.inputBitstreamFilename );
		}

		#ifdef WMOPS_FLT
		#ifdef WMOPS
		print_wmops();
		print_mem( NULL );
		#endif

		if ( !arg.quietModeEnabled )
		{
		printf( "\n" );
		@@ -1550,7 +1544,7 @@ static ivas_error decodeG192(

		delayNumSamples_orig[0] = -1;

		#ifdef WMOPS_FLT
		#ifdef WMOPS
		reset_stack();
		reset_wmops();
		#endif
		@@ -1806,28 +1800,18 @@ static ivas_error decodeG192(
		}
		}
		}

		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
		#ifdef WMOPS_FLT

		#ifdef WMOPS
		if ( vec_pos_update == 0 )
		{
		update_wmops();
		update_mem();
		#ifdef MEM_COUNT_DETAILS
		export_mem( "mem_analysis.csv" );
		#endif
		}
		#endif
		#ifdef WMOPS
		#ifndef DONT_COUNT
		if ( vec_pos_update == 0 )
		{
		/* update WMPOS counting (end of frame) */
		BASOP_frame_update();
		}

		#endif
		#endif
		}
		/------------------------------------------------------------------------------------------
		* Flush what is still left in the VoIP Buffers....
		------------------------------------------------------------------------------------------/
		@@ -1948,12 +1932,15 @@ static ivas_error decodeG192(
		}
		}
		}

		#ifdef WMOPS
		#ifndef DONT_COUNT
		/* update WMPOS counting (end of frame) */
		BASOP_frame_update();
		update_wmops();
		update_mem();
		#ifdef MEM_COUNT_DETAILS
		export_mem( "mem_analysis.csv" );
		#endif
		#endif

		frame++;
		if ( !arg.quietModeEnabled )
		{
		@@ -2211,7 +2198,7 @@ static ivas_error decodeVoIP(
		fprintf( stdout, "\n-- Start the decoder (quiet mode) --\n\n" );
		}

		#ifdef WMOPS_FLT
		#ifdef WMOPS
		reset_stack();
		reset_wmops();
		#endif
		@@ -2493,13 +2480,8 @@ static ivas_error decodeVoIP(
		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
		frame++;
		systemTime_ms += systemTimeInc_ms;

		#ifdef WMOPS
		#ifndef DONT_COUNT
		/* update WMPOS counting (end of frame) */
		BASOP_frame_update();
		#endif
		#endif
		#ifdef WMOPS_FLT
		update_mem();
		update_wmops();
		#endif

apps/encoder.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@
		#include "jbm_file_reader.h"
		#include "masa_file_reader.h"
		#include "wmc_auto.h"
		#include "options.h"
		#include "stl.h"

lib_com/basop32.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ HISTORY:
		#pragma warning( disable : 4310 )
		#endif

		#if ( WMOPS )
		#ifdef WMOPS
		extern BASIC_OP multiCounter[MAXCOUNTERS];
		extern int currCounter;
		#endif
		@@ -896,11 +896,10 @@ Word16 shl_sat( Word16 var1, Word16 var2 )
		*/
		#ifdef BASOP_NOGLOB
		Word16 shr_o( Word16 var1, Word16 var2, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word16 shr( Word16 var1, Word16 var2 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word16 var_out;

		if ( var2 < 0 )
		@@ -914,7 +913,7 @@ Word16 shr( Word16 var1, Word16 var2 )
		var_out = shl( var1, var2 );
		#endif /* BASOP_NOGLOB */

		#if ( WMOPS )
		#ifdef WMOPS
		multiCounter[currCounter].shl--;
		#endif
		}
		@@ -995,11 +994,10 @@ Word16 shr_sat( Word16 var1, Word16 var2 )
		*/
		#ifdef BASOP_NOGLOB
		Word16 mult_o( Word16 var1, Word16 var2, Flag *Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word16 mult( Word16 var1, Word16 var2 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word16 var_out;
		Word32 L_product;

		@@ -1589,11 +1587,10 @@ Word32 DEPR_L_macNs( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry )
		#endif
		#ifdef BASOP_NOGLOB
		Word32 L_macNs_co( Word32 L_var3, Word16 var1, Word16 var2, Flag Carry, Flag Overflow )
		{
		#else /* BASOP_NOGLOB */
		Word32 L_macNs( Word32 L_var3, Word16 var1, Word16 var2 )
		{
		#endif /* BASOP_NOGLOB */
		{
		Word32 L_var_out;

		#ifdef BASOP_NOGLOB