Merge with main (ff199b0f) · Commits · SA4 / Audio / IVAS BASOP

CMakeLists.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ file(GLOB libDecSrcs "lib_dec/*.c")
		file(GLOB libDecHeaders "lib_dec/*.h")
		add_library(lib_dec ${libDecSrcs} ${libDecHeaders})
		target_link_libraries(lib_dec lib_com lib_basop lib_rend lib_debug lib_isar)
		target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_basop lib_enc lib_isar lib_util)
		target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_basop lib_enc lib_isar)

		file(GLOB libUtilSrcs "lib_util/*.c")
		file(GLOB libUtilHeaders "lib_util/*.h")
		@@ -184,7 +184,7 @@ target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)

		if(NOT WMOPS)
		add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus_basop/ivas_lc3plus_unit_test.c)
		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_basop lib_debug lib_isar)
		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_com lib_basop lib_debug lib_isar)
		endif()

		file(GLOB libISARSrcs "lib_isar/*.c")

+2 −2

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -829,10 +829,10 @@ int main(
		/* scene orientation */
		if ( sceneOrientationFileReader )
		{
		PIDATA_TS *piDataTs = &ivasRtp.piData[ivasRtp.nWrittenPiData++];
		IVAS_PIDATA_TS *piDataTs = &ivasRtp.piData[ivasRtp.nWrittenPiData++];
		IVAS_PIDATA_ORIENTATION *scene = &piDataTs->data.scene;

		memset( piDataTs, 0, sizeof( PIDATA_TS ) );
		memset( piDataTs, 0, sizeof( IVAS_PIDATA_TS ) );
		scene->size = sizeof( IVAS_PIDATA_ORIENTATION );
		scene->piDataType = IVAS_PI_SCENE_ORIENTATION;

		@@ -846,10 +846,10 @@ int main(
		/* device orientation */
		if ( deviceOrientationFileReader )
		{
		PIDATA_TS *piDataTs = &ivasRtp.piData[ivasRtp.nWrittenPiData++];
		IVAS_PIDATA_TS *piDataTs = &ivasRtp.piData[ivasRtp.nWrittenPiData++];
		IVAS_PIDATA_ORIENTATION *device = &piDataTs->data.deviceUnCompensated;

		memset( piDataTs, 0, sizeof( PIDATA_TS ) );
		memset( piDataTs, 0, sizeof( IVAS_PIDATA_TS ) );
		device->size = sizeof( IVAS_PIDATA_ORIENTATION );
		device->piDataType = IVAS_PI_DEVICE_ORIENTATION_COMPENSATED;

+4 −4

Original line number	Diff line number	Diff line
		@@ -938,10 +938,10 @@ int encoder_main(
		/* scene orientation */
		if ( sceneOrientationFileReader )
		{
		PIDATA_TS *piDataTs = &ivasRtp->piData[ivasRtp->nWrittenPiData++];
		IVAS_PIDATA_TS *piDataTs = &ivasRtp->piData[ivasRtp->nWrittenPiData++];
		IVAS_PIDATA_ORIENTATION *scene = &piDataTs->data.scene;

		memset( piDataTs, 0, sizeof( PIDATA_TS ) );
		memset( piDataTs, 0, sizeof( IVAS_PIDATA_TS ) );
		scene->size = sizeof( IVAS_PIDATA_ORIENTATION );
		scene->piDataType = IVAS_PI_SCENE_ORIENTATION;

		@@ -955,10 +955,10 @@ int encoder_main(
		/* device orientation */
		if ( deviceOrientationFileReader )
		{
		PIDATA_TS *piDataTs = &ivasRtp->piData[ivasRtp->nWrittenPiData++];
		IVAS_PIDATA_TS *piDataTs = &ivasRtp->piData[ivasRtp->nWrittenPiData++];
		IVAS_PIDATA_ORIENTATION *device = &piDataTs->data.deviceUnCompensated;

		memset( piDataTs, 0, sizeof( PIDATA_TS ) );
		memset( piDataTs, 0, sizeof( IVAS_PIDATA_TS ) );
		device->size = sizeof( IVAS_PIDATA_ORIENTATION );
		device->piDataType = IVAS_PI_DEVICE_ORIENTATION_COMPENSATED;

+19 −2

Original line number	Diff line number	Diff line
		@@ -988,7 +988,6 @@ Word32 div_w( Word32 L_num, Word32 L_den )
		}


		static Word32 div_w_newton( Word32 num, Word32 den );
		/*
		Table of 256 precalculated estimates to be used by the "div_w_newton"
		function using the Newton/Raphson method.
		@@ -1283,7 +1282,7 @@ static Word32 L_dmult( Word32 L_var1, Word32 L_var2 )
		* BASOP weights: 24 (incl. L_dmult)
		*/

		static Word32 div_w_newton( Word32 num, Word32 den )
		Word32 div_w_newton( Word32 num, Word32 den )
		{
		Word32 x0, x1, x2, x3, diff, result;

		@@ -2969,3 +2968,21 @@ Word64 Mpy_64_32( Word64 W_var1, Word32 L_var2 )
		var_out = W_mac_32_32( W_shr( var_out, 31 ), W_extract_h( W_var1 ), L_var2 );
		return var_out;
		}

		#ifndef FUNCTION_W_msu0_32_32
		Word64 W_msu0_32_32( Word64 L64_var1, Word32 L_var2, Word32 L_var3 )
		{
		/* no saturation */
		L64_var1 = W_sub_nosat( L64_var1, W_mult0_32_32( L_var2, L_var3 ) );
		return L64_var1;
		}
		#endif

		#ifndef FUNCTION_W_mac0_32_32
		Word64 W_mac0_32_32( Word64 L64_var1, Word32 L_var2, Word32 L_var3 )
		{
		/* no saturation */
		L64_var1 = W_add_nosat( L64_var1, W_mult0_32_32( L_var2, L_var3 ) );
		return L64_var1;
		}
		#endif