Commit 2d71b8c5 authored Feb 07, 2024 by vaillancour

Merge branch 'main' into eval_complexity_0128

parents 51ea49a8 d7875386

.gitlab-ci.yml

+4 −2

Original line number	Diff line number	Diff line
		@@ -110,8 +110,10 @@ stages:

		# TODO: this needs to be updated in case the reference is updated
		.remove-unsupported-testcases: &remove-unsupported-testcases
		- sed -i '1649,1655d' scripts/config/self_test.prm

		- sed -i '1701,1707d' scripts/config/self_test.prm
		- sed -i '1659,1661d' scripts/config/self_test.prm
		- sed -i '1635,1637d' scripts/config/self_test.prm
		- sed -i '1603,1605d' scripts/config/self_test.prm

		.apply-testv-scaling: &apply-testv-scaling
		- echo "Applying level scaling in scripts/testv using scale=$LEVEL_SCALING"

apps/renderer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1194,7 +1194,7 @@ int main(
		/* Convert from int to float and from interleaved to packed */
		convertInputBuffer( inpInt16Buffer, numSamplesRead, inBuffer.config.numSamplesPerChannel, num_in_channels, inFloatBuffer );
		#ifdef IVAS_FLOAT_FIXED
		*outBuffer.pq_fact = 16 - ( gd_bits + 1 );
		*outBuffer.pq_fact = 16 - ( gd_bits);
		convertInputBuffer_fx( inpInt16Buffer, numSamplesRead, inBuffer.config.numSamplesPerChannel, num_in_channels, inInt32Buffer, *outBuffer.pq_fact );
		#endif
		int16_t num_subframes, sf_idx;

lib_com/cnst.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -1966,6 +1966,7 @@ typedef enum _DCTTYPE
		#define INV_PREECHO_SMOOTH_LENP1 ( 1 / ( PREECHO_SMOOTH_LEN + 1.0 ) );

		#define EPSILON 0.000000000000001f
		#define EPSILON_fx 0

		#define MAX_SEGMENT_LENGTH 480
		#define NUM_TIME_SWITCHING_BLOCKS 4

lib_com/fft_fx.c

+15 −11

Original line number	Diff line number	Diff line
		@@ -5449,7 +5449,11 @@ Word16 find_guarded_bits_fx( Word32 n )
		: n <= 256 ? 8
		: n <= 512 ? 9
		: n <= 1024 ? 10
		: 11;
		: n <= 2048 ? 11
		: n <= 4096 ? 12
		: n <= 8192 ? 13
		: n <= 16384 ? 14
		: 15;
		}

		Word16 L_norm_arr( Word32 *arr, Word16 size )

lib_com/ivas_cnst.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,10 @@
		#define INV_SQRT2 7.071067811865475e-1f /* 1/sqrt(2) */
		#define INV_SQRT3 0.577350269189626f /* 1/sqrt(3) */

		#ifdef IVAS_FLOAT_FIXED
		#define INV_SQRT2_FX 23170 /* 1/sqrt(2) Q15*/
		#endif

		#define LOG_10 2.30258509299f