Merge branch 'main' into 539-chirp-artifacts-in-MASA-at-384-kbps-for-a-specific-sample (f0407ccc) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/env_stab.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,9 @@
		#include "prot.h"
		#include "rom_com.h"
		#include "wmc_auto.h"
		#ifdef FIX_594_STL_INCLUDE
		#include "stl.h"
		#endif
		#ifdef DEBUGGING
		#include "assert.h"
		#endif
		@@ -92,8 +95,12 @@ float env_stability(
		#ifdef BASOP_NOGLOB
		Overflow = 0;
		env_delta = shl_o( *mem_env_delta, 1, &Overflow );
		#else
		#ifdef FIX_595_SHL_NOGLOB
		env_delta = shl( *mem_env_delta, 1 );
		#else
		env_delta = shl_o( *mem_env_delta, 1 );
		#endif
		#endif
		}
		else

lib_com/ifft_rel.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -229,7 +229,11 @@ void ifft_rel(
		-----------------------------------------------------------------/

		idx = fft256_read_indexes;
		#ifdef FIX_622_SILENCE_USAN_WARNING
		xi0 = &temp[0] - 1;
		#else
		xi0 = temp - 1;
		#endif
		if ( n == 128 )
		{
		for ( i = 0; i < n; i++ )

lib_com/ivas_cnst.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -887,7 +887,12 @@ enum fea_names
		#define MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE 3

		typedef enum {
		#ifdef FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE
		NOISE_GEN_MODE_UNDEF = -1,
		EQUAL_CORES = 0,
		#else
		EQUAL_CORES,
		#endif
		TCX10_IN_0_TCX20_IN_1,
		TCX20_IN_0_TCX10_IN_1,
		} TONALMDCTCONC_NOISE_GEN_MODE;

lib_com/ivas_dirac_com.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -111,12 +111,20 @@ ivas_error ivas_dirac_config(
		if ( ( (Encoder_Struct *) st_ivas )->hSpar != NULL )
		{
		hFbMdft = ( (Encoder_Struct *) st_ivas )->hSpar->hFbMixer;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Encoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}
		else
		{
		hFbMdft = NULL;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = NULL;
		#endif
		}
		#ifndef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Encoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}
		else
		{
		@@ -131,13 +139,21 @@ ivas_error ivas_dirac_config(
		if ( ( (Decoder_Struct *) st_ivas )->hSpar != NULL )
		{
		hFbMdft = ( (Decoder_Struct *) st_ivas )->hSpar->hFbMixer;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Decoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}
		else
		{
		hFbMdft = NULL;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = NULL;
		#endif
		}
		( (Decoder_Struct *) st_ivas )->hDirAC->hFbMdft = hFbMdft;
		#ifndef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Decoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}

		if ( ivas_format == SBA_FORMAT )

lib_com/ivas_prot.h

+24 −0

Original line number	Diff line number	Diff line
		@@ -4252,6 +4252,10 @@ void ivas_sba_mix_matrix_determiner(
		const int16_t bfi, /* i : BFI flag */
		const int16_t nchan_remapped, /* i : num channels after remapping of TCs */
		const int16_t output_frame /* i : output frame length */
		#ifdef VLBR_20MS_MD
		,
		const int16_t num_md_sub_frames /* i : number of subframes in mixing matrix */
		#endif
		);

		/* AGC */
		@@ -4554,7 +4558,23 @@ void ivas_get_spar_md_from_dirac(
		int16_t ivas_get_spar_dec_md_num_subframes(
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		#ifdef VLBR_20MS_MD
		,
		const int32_t ivas_last_active_brate /* i : IVAS last active bitrate */
		#endif
		);
		#ifdef VLBR_20MS_MD

		ivas_error ivas_spar_md_dec_matrix_open(
		ivas_spar_md_dec_state_t hMdDec, / i/o: SPAR MD decoder handle */
		const int16_t num_channels, /* i : number of internal channels */
		const int16_t num_md_sub_frames );

		void ivas_spar_md_dec_matrix_close(
		ivas_spar_md_dec_state_t hMdDecoder, / i/o: SPAR MD decoder handle */
		const int16_t num_channels ); /* i : number of internal channels */

		#endif

		ivas_error ivas_spar_md_dec_open(
		ivas_spar_md_dec_state_t *hMdDec_out, / i/o: SPAR MD decoder handle */
		@@ -4562,6 +4582,10 @@ ivas_error ivas_spar_md_dec_open(
		const int16_t num_channels, /* i : number of internal channels */
		const int16_t sba_order, /* i : SBA order */
		const int16_t sid_format /* i : SID format */
		#ifdef VLBR_20MS_MD
		,
		const int32_t last_active_ivas_total_brate /* i : IVAS last active bitrate */
		#endif
		);

		void ivas_spar_md_dec_close(