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

Workspace_msvc/isar_post_rend.vcxproj

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -148,8 +148,6 @@
	</ItemDefinitionGroup>		</ItemDefinitionGroup>
	<ItemGroup>		<ItemGroup>
	<ClCompile Include="..\apps\isar_post_rend.c" />		<ClCompile Include="..\apps\isar_post_rend.c" />
	<ClCompile Include="..\lib_com\enh64.c" />
	<ClCompile Include="..\lib_com\enhUL32.c" />
	</ItemGroup>		</ItemGroup>
	<ItemGroup>		<ItemGroup>
	<ProjectReference Include="lib_debug.vcxproj">		<ProjectReference Include="lib_debug.vcxproj">

Workspace_msvc/lib_com.vcxproj.filters

+639 −208

File changed.

Preview size limit exceeded, changes collapsed.

apps/decoder.c

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -373,6 +373,7 @@ int main(
	}		}
	}		}

			#ifndef FIX_1158_FASTCONV_REVERB_HRTF
	/------------------------------------------------------------------------------------------		/------------------------------------------------------------------------------------------
	* Open renderer configuration reader file		* Open renderer configuration reader file
	------------------------------------------------------------------------------------------/		------------------------------------------------------------------------------------------/
	@@ -393,6 +394,7 @@ int main(
	goto cleanup;		goto cleanup;
	}		}
	}		}
			#endif

	/------------------------------------------------------------------------------------------		/------------------------------------------------------------------------------------------
	* Configure the decoder		* Configure the decoder
	@@ -482,6 +484,14 @@ int main(
	goto cleanup;		goto cleanup;
	}		}

			#ifdef FIX_1158_FASTCONV_REVERB_HRTF
			if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )
			{
			fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );
			goto cleanup;
			}
			#endif

	if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )		if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )
	{		{
	fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );		fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
	@@ -3060,14 +3070,10 @@ static ivas_error decodeVoIP(
	}		}
	vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
	frame++;		frame++;
	#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
	if ( vec_pos_update == 0 )		if ( vec_pos_update == 0 )
	{		{
	systemTime_ms += vec_pos_len * systemTimeInc_ms;		systemTime_ms += vec_pos_len * systemTimeInc_ms;
	}		}
	#else
	systemTime_ms += systemTimeInc_ms;
	#endif

	#ifdef WMOPS		#ifdef WMOPS
	update_mem();		update_mem();
	@@ -3076,7 +3082,6 @@ static ivas_error decodeVoIP(
	}		}


	#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
	int16_t nSamplesFlushed = 0;		int16_t nSamplesFlushed = 0;

	/* decode and get samples */		/* decode and get samples */
	@@ -3156,7 +3161,6 @@ static ivas_error decodeVoIP(
	}		}
	}		}
	}		}
	#endif


	/------------------------------------------------------------------------------------------		/------------------------------------------------------------------------------------------

lib_com/ivas_prot_fx.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1612,12 +1612,8 @@ void decoder_tcx_imdct_fx(
	Word32 x_fx[N_MAX],		Word32 x_fx[N_MAX],
	Word16 q_x,		Word16 q_x,
	Word16 xn_buf_fx[],		Word16 xn_buf_fx[],
	#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN
	Word16 *q_win,		Word16 *q_win,
	Word16 *q_winFB,		Word16 *q_winFB,
	#else
	Word16 q_win,
	#endif
	const UWord16 kernelType, /* i : TCX transform kernel type */		const UWord16 kernelType, /* i : TCX transform kernel type */
	const Word16 fUseTns, /* i : flag that is set if TNS data is present */		const Word16 fUseTns, /* i : flag that is set if TNS data is present */
	Word16 synth_fx[], /* i/o: synth[-M..L_frame] */		Word16 synth_fx[], /* i/o: synth[-M..L_frame] */

lib_com/ivas_tools_fx.c

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -606,9 +606,6 @@ Word64 dot_product_cholesky_fixed(
	{		{
	Word16 i, j;		Word16 i, j;
	Word64 suma, tmp_sum;		Word64 suma, tmp_sum;
	#ifndef OPT_MCT_ENC_V3_BE
	Word32 mul;
	#endif
	Word32 tmp;		Word32 tmp;
	const Word32 pt_x, pt_A;		const Word32 pt_x, pt_A;
	pt_A = A;		pt_A = A;
	@@ -623,20 +620,10 @@ Word64 dot_product_cholesky_fixed(

	FOR( j = 0; j <= i; j++ )		FOR( j = 0; j <= i; j++ )
	{		{
	#ifdef OPT_MCT_ENC_V3_BE
	tmp_sum = W_add( tmp_sum, Mpy_32_32( pt_x++, pt_A++ ) );		tmp_sum = W_add( tmp_sum, Mpy_32_32( pt_x++, pt_A++ ) );
	#else
	mul = Mpy_32_32( pt_x++, pt_A++ );
	tmp_sum = W_add( tmp_sum, W_deposit32_l( mul ) );
	#endif
	}		}

	#ifdef OPT_MCT_ENC_V3_BE
	tmp = W_shl_sat_l( tmp_sum, -4 ); // to make sure that the tmp_sum will not overflow		tmp = W_shl_sat_l( tmp_sum, -4 ); // to make sure that the tmp_sum will not overflow
	#else
	tmp_sum = W_shr( tmp_sum, 4 ); // to make sure that the tmp_sum will not overflow
	tmp = W_extract_l( tmp_sum );
	#endif
	suma = W_mac_32_32( suma, tmp, tmp );		suma = W_mac_32_32( suma, tmp, tmp );
	}		}