Merge branch 'main' into 744_step1_scripts_and_brir_fix (3437df83) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

100755 → 100644

+3 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@
		/* ################### Start DEBUGGING switches ########################### */

		#ifndef RELEASE
		#define DEBUGGING /* Activate debugging part of the code */
		/* #define DEBUGGING / / Activate debugging part of the code */
		#endif
		/#define WMOPS/ /* Activate complexity and memory counters */
		/#define WMOPS_PER_FRAME/ /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */
		@@ -157,6 +157,7 @@
		#define FIX_921_OMASA_DELAY_PRINTOUT /* VA: issue 921: correct OMASA decoder delay printout */
		#define FIX_929_RENDERER_CMDL /* Nokia: issue #929: renderer command line option */
		#define FIX_910_REMOVE_DUPLICATION_TD_REND /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */
		#define FIX_940_DEBUGGING_VARIABLE /* Nokia: issue #940: remove debugging variable */

		/* #################### End BE switches ################################## */

		@@ -170,6 +171,7 @@
		#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */
		#define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING /* Dlb: issue 907: fix for band mapping at VLBR */
		#define NONBE_FIX_869_MASA_PREREND_MERGE /* Nokia: issue: #869: MASA pre-rend not updating energy */
		#define NONBE_FIX_931_IGF_STEREO_DEC_NOISE /* FhG: issue #931: fix noise substitution in the stereo IGF decoder */

		/* ##################### End NON-BE switches ########################### */

lib_dec/igf_dec.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -490,7 +490,11 @@ static void IGF_prepStereo(
		{
		if ( hPrivateDataL->n_noise_bands_off )
		{
		#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE
		IGF_replaceTCXNoise_2_new( src_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );
		#else
		IGF_replaceTCXNoise_2_new( igf_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );
		#endif
		}
		sel_specL = src_specL;
		}
		@@ -507,7 +511,11 @@ static void IGF_prepStereo(
		{
		if ( hPrivateDataR->n_noise_bands_off )
		{
		#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE
		IGF_replaceTCXNoise_2_new( src_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );
		#else
		IGF_replaceTCXNoise_2_new( igf_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );
		#endif
		}
		sel_specR = src_specR;
		}
		@@ -574,7 +582,11 @@ static void IGF_prepStereo(
		{
		if ( hPrivateDataL->n_noise_bands_off )
		{
		#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE
		IGF_replaceTCXNoise_2_new( src_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );
		#else
		IGF_replaceTCXNoise_2_new( igf_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );
		#endif
		}
		sel_specL = src_specL;
		}
		@@ -591,7 +603,11 @@ static void IGF_prepStereo(
		{
		if ( hPrivateDataR->n_noise_bands_off )
		{
		#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE
		IGF_replaceTCXNoise_2_new( src_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );
		#else
		IGF_replaceTCXNoise_2_new( igf_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );
		#endif
		}
		sel_specR = src_specR;
		}

lib_dec/ivas_qmetadata_dec.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -4247,14 +4247,20 @@ static void read_stream_dct_coeffs_omasa(
		int16_t *index,
		const int16_t first_line )
		{
		#ifdef FIX_940_DEBUGGING_VARIABLE
		int16_t sign;
		#else
		int16_t sign, nbits;
		#endif
		int16_t i, j, i_min;

		float step;
		int16_t GR1, GR2;

		step = STEP_M2T;
		#ifndef FIX_940_DEBUGGING_VARIABLE
		nbits = 0;
		#endif
		sign = 1;
		if ( first_line == 0 )
		{
		@@ -4264,7 +4270,9 @@ static void read_stream_dct_coeffs_omasa(
		{
		sign = -1;
		}
		#ifndef FIX_940_DEBUGGING_VARIABLE
		nbits++;
		#endif
		}

		set_s( q_idx, 0, len_stream );
		@@ -4286,7 +4294,9 @@ static void read_stream_dct_coeffs_omasa(
		{
		i_min = ( i_min << 1 ) + bit_stream[( *index )--];
		}
		#ifndef FIX_940_DEBUGGING_VARIABLE
		nbits += j;
		#endif
		/* read GR orders */
		GR1 = bit_stream[( *index )--] + 1;
		if ( GR1 == 2 )