- Merge remote-tracking branch 'remotes/origin/main' into... (96fe1b4b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -196,11 +196,7 @@ int main(
		RotFileReader *refRotReader = NULL;
		Vector3PairFileReader *referenceVectorReader = NULL;
		RenderConfigReader *renderConfigReader = NULL;
		#ifdef FIX_847_OUTPUT_PCM_BUFFER
		int16_t *pcmBuf = NULL;
		#else
		int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];
		#endif
		#ifdef DEBUGGING
		int32_t noClipping;
		int32_t cnt_frames_limited;
		@@ -743,7 +739,6 @@ int main(
		}
		}

		#ifdef FIX_847_OUTPUT_PCM_BUFFER
		/------------------------------------------------------------------------------------------
		* Allocate output data buffer
		------------------------------------------------------------------------------------------/
		@@ -757,8 +752,6 @@ int main(

		pcmBuf = malloc( pcmBufSize * sizeof( int16_t ) );

		#endif

		/-----------------------------------------------------------------
		* Decoding
		-----------------------------------------------------------------/
		@@ -812,9 +805,7 @@ int main(

		cleanup:

		#ifdef FIX_847_OUTPUT_PCM_BUFFER
		free( pcmBuf );
		#endif

		#ifdef DEBUG_SBA_AUDIO_DUMP
		IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

lib_com/ivas_cnst.h

+2 −6

Original line number	Diff line number	Diff line
		@@ -181,13 +181,7 @@ typedef enum
		#define MAX_JBM_L_FRAME48k 1920
		#define MAX_JBM_L_FRAME_NS 40000000L
		#define MAX_SPAR_INTERNAL_CHANNELS IVAS_SPAR_MAX_CH
		#ifdef JBM_FOR_OSBA
		#define MAX_CLDFB_DIGEST_CHANNELS (FOA_CHANNELS + MAX_NUM_OBJECTS)
		#else
		#define MAX_CLDFB_DIGEST_CHANNELS 4
		#endif

		#define MASA_JBM_RINGBUFFER_FRAMES 3

		typedef enum
		{
		@@ -1224,6 +1218,8 @@ enum
		#define MASA_MAXIMUM_TWO_DIR_BANDS 24
		#define NBITS_HR_COH 4

		#define MASA_JBM_RINGBUFFER_FRAMES 3

		typedef enum
		{
		MASA_STEREO_NOT_DEFINED,

lib_com/ivas_error.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -65,9 +65,7 @@ typedef enum
		IVAS_ERR_INVALID_FEC_CONFIG,
		IVAS_ERR_INVALID_FEC_OFFSET,
		IVAS_ERR_INVALID_INPUT_BUFFER_SIZE,
		#ifdef FIX_847_OUTPUT_PCM_BUFFER
		IVAS_ERR_INVALID_OUTPUT_BUFFER_SIZE,
		#endif
		IVAS_ERR_DTX_NOT_SUPPORTED,
		IVAS_ERR_UNEXPECTED_NULL_POINTER,
		IVAS_ERR_METADATA_NOT_EXPECTED,
		@@ -217,10 +215,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
		return "Invalid FEC offset";
		case IVAS_ERR_INVALID_INPUT_BUFFER_SIZE:
		return "Invalid input buffer size";
		#ifdef FIX_847_OUTPUT_PCM_BUFFER
		case IVAS_ERR_INVALID_OUTPUT_BUFFER_SIZE:
		return "Invalid output buffer size";
		#endif
		case IVAS_ERR_DTX_NOT_SUPPORTED:
		return "DTX is not supported in this IVAS format and element mode";
		case IVAS_ERR_UNEXPECTED_NULL_POINTER:

lib_com/ivas_prot.h

+29 −8

Original line number	Diff line number	Diff line
		@@ -430,6 +430,26 @@ ivas_error ivas_core_enc(
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
		const int16_t n_CoreChannels, /* i : number of core channels to be coded */
		#ifdef FIX_854_ARRAY_SIZE_MISMATCH
		float old_inp_12k8[][L_INP_12k8], /* i : buffer of old input signal */
		float old_inp_16k[][L_INP], /* i : buffer of old input signal */
		float ener[], /* i : residual energy from Levinson-Durbin */
		float A[][NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes */
		float Aw[][NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquantized for subframes */
		float epsP[][M + 1], /* i : LP prediction errors */
		float lsp_new[][M], /* i : LSPs at the end of the frame */
		float lsp_mid[][M], /* i : LSPs in the middle of the frame */
		const int16_t vad_hover_flag[], /* i : VAD hanglover flag */
		int16_t attack_flag[], /* i : attack flag (GSC or TC) */
		float realBuffer[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer */
		float imagBuffer[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer */
		float old_wsp[][L_WSP], /* i : weighted input signal buffer */
		const int16_t loc_harm[], /* i : harmonicity flag */
		const float cor_map_sum[], /* i : speech/music clasif. parameter */
		const int16_t vad_flag_dtx[], /* i : HE-SAD flag with additional DTX HO */
		float enerBuffer[][CLDFB_NO_CHANNELS_MAX], /* i : energy buffer */
		float fft_buff[][2 * L_FFT], /* i : FFT buffer */
		#else
		float old_inp_12k8[CPE_CHANNELS][L_INP_12k8], /* i : buffer of old input signal */
		float old_inp_16k[CPE_CHANNELS][L_INP], /* i : buffer of old input signal */
		float ener[CPE_CHANNELS], /* i : residual energy from Levinson-Durbin */
		@@ -448,6 +468,7 @@ ivas_error ivas_core_enc(
		const int16_t vad_flag_dtx[CPE_CHANNELS], /* i : HE-SAD flag with additional DTX HO */
		float enerBuffer[CPE_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i : energy buffer */
		float fft_buff[CPE_CHANNELS][2 * L_FFT], /* i : FFT buffer */
		#endif
		const int16_t tdm_SM_flag, /* i : channel combination scheme flag */
		const int16_t ivas_format, /* i : IVAS format */
		const int16_t flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */
		@@ -459,8 +480,13 @@ ivas_error ivas_core_dec(
		CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
		MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
		const int16_t n_channels, /* i : number of channels to be decoded */
		#ifdef FIX_854_ARRAY_SIZE_MISMATCH
		float output[], / o : output synthesis signal */
		float outputHB[][L_FRAME48k], /* o : output HB synthesis signal */
		#else
		float output[CPE_CHANNELS], / o : output synthesis signal */
		float outputHB[CPE_CHANNELS][L_FRAME48k], /* o : output HB synthesis signal */
		#endif
		float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
		const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
		);
		@@ -3467,9 +3493,7 @@ void ivas_sba_set_cna_cng_flag(
		);

		ivas_error ivas_sba_dec_reconfigure(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		#ifdef JBM_FOR_OSBA
		,
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		uint16_t nSamplesFlushed, / o : number of samples flushed */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		const PCM_RESOLUTION pcm_resolution, /* i : type for the decoded PCM resolution */
		@@ -3477,7 +3501,6 @@ ivas_error ivas_sba_dec_reconfigure(
		#else
		int16_t data / o : output synthesis signal */
		#endif
		#endif
		);

		ivas_error ivas_sba_digest_tc(
		@@ -5701,7 +5724,6 @@ ivas_error ivas_osba_data_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder handle */
		);

		#ifdef JBM_FOR_OSBA
		ivas_error ivas_osba_dirac_td_binaural_jbm(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */
		@@ -5709,7 +5731,6 @@ ivas_error ivas_osba_dirac_td_binaural_jbm(
		uint16_t nSamplesAvailable, / o : number of CLDFB slots still to render */
		float output_f[] / o : rendered time signal */
		);
		#endif

		ivas_error ivas_osba_dirac_td_binaural(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */

lib_com/options.h

+3 −17

Original line number	Diff line number	Diff line
		@@ -148,16 +148,13 @@
		/* only BE switches wrt selection floating point code */

		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */

		/#define SPLIT_REND_WITH_HEAD_ROT/ /* Dlb,FhG: Split Rendering contributions 21 and 35 */
		#define REMOVE_UNUSED_FUNCTION /* Dlb: Remove functions that are unhit/unused */
		#define FIX_MSAN_USAN_ERROR_JBM /* Dlb: Resolve MSAN and USAN errors in the SBA-JBM test case added*/

		#define FIX_818_DOUBLE_PREC_KERNEL_SW /* FhG: Issue 818: Avoid double precision in kernel switching */
		#define FIX_822_REFACTOR_BIN_REVERB_OPEN /* Nokia: Addresses first step of issue 822 by refactoring ivas_binaural_reverb_open */
		#define FIX_847_OUTPUT_PCM_BUFFER /* VA: issue 847: Allocate decoder output PCM buffer dynamically */
		#define FIX_854_ARRAY_SIZE_MISMATCH /* VA: issue 854: correct the mismatch between definition and declaration of `ivas_core_dec() */
		#define FIX_785_REMOVE_DEAD_CODE /* VA: issue 785: remove dead code */
		#define FIX_852_FIX_HANDLE_DEREF /* VA: issue 852: Fix missing handle dereferencing of hIsmMetadaData in ivas_ism_metadata_close() */


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


		@@ -165,17 +162,6 @@
		/* any switch which is non-be wrt selection floating point code */
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_833_OSBA_JBM_OBJECT_GAINS /* Fhg: issue #833: Resolve "JBM OSBA: the gains for the discrete objects are not computed" */
		#define JBM_FOR_OSBA /* FhG: implement OSBA format in the JBM path */
		#ifdef JBM_FOR_OSBA
		#define OSBA_ROOM_IR
		#endif
		#define NONBE_FIX_808_JBM_PARAMUPMIX_RS /* FhG: Issue 808: fix JBM MC rate switching */
		#define NONBE_FIX_846_JBM_MASA_SIDSTART /* FhG: Issue #846: fix JBM for MASA DTX when the first frame is a SID frame */
		#define NONBE_FIX_841_MC_RS_TDOBJ_RENDERER /* FhG: Issue #841: [Non-BE] Resolve "MC RS HRFT handle not set to NULL" */
		#define NONBE_FIX_840_PARAMMC_RS /* FhG: Issue #840: Resolve "MC RS ParamMC hoa encoder wrongly set to zero" */
		#define NONBE_FIX_826_JBM_MASA_CNA_CNG /* FhG: issue #826: Resolve "JBM MASA: CNA and CNG not in sync with non-JBM decoding" */
		#define NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT /* FhG: issue #835: Resolve "JBM: ParamUpmix head rotation broken" */
		#define NONBE_FIX_838_CRASH_24_4_WB /* FhG: Issue 838: fix encoder crashes for Unified Stereo and MASA 2 TC at 24.4 kbps WB due to missing IGF (re-) allocation */
		#define NONBE_FIX_839_MC_RS_CHANNEL_ALLOC /* FhG: Issues #839: problems with reallocation of the channels on the heap in case of MC RS */
		#define BE_FIX_832_ASAN_ERROR_EFAP_OSBA /* FhG: issue #832: fix ASAN error caused by re-allocating EFAP memories in OSBA*/

Admin message