Merge branch 'main' into 471-integrate-the-multichannel-parametric-upmix-into-the-jbm-path (948486df) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/bitstream.c

+136 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,131 @@ Word16 rate2EVSmode(
		* Re-allocate the list of indices
		-------------------------------------------------------------------/

		#ifdef FIX_MEM_REALLOC_IND_LIST
		ivas_error ind_list_realloc(
		INDICE_HANDLE old_ind_list, /* i : pointer to the beginning of the old buffer of indices */
		const int16_t max_num_indices, /* i : new maximum number of allowed indices in the list */
		Encoder_Struct st_ivas / i : IVAS encoder structure */
		)
		{
		int16_t i, n, ch, n_channels, ind_list_pos, is_metadata, ivas_max_num_indices;
		INDICE_HANDLE new_ind_list;
		BSTR_ENC_HANDLE hBstr;

		if ( st_ivas == NULL )
		{
		return IVAS_ERR_OK;
		}

		/* get the pointer to the beginning of the old buffer of indices (either metadata or core coders) */
		if ( old_ind_list == st_ivas->ind_list_metadata )
		{
		is_metadata = 1;
		ivas_max_num_indices = st_ivas->ivas_max_num_indices_metadata;
		}
		else
		{
		is_metadata = 0;
		ivas_max_num_indices = st_ivas->ivas_max_num_indices;
		}

		/* allocate new buffer of indices */
		if ( ( new_ind_list = (INDICE_HANDLE) malloc( max_num_indices * sizeof( Indice ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for buffer of indices!\n" ) );
		}

		/* move indices from the old list to the new list */
		for ( i = 0; i < min( max_num_indices, ivas_max_num_indices ); i++ )
		{
		if ( old_ind_list[i].nb_bits > -1 )
		{
		new_ind_list[i].id = old_ind_list[i].id;
		new_ind_list[i].value = old_ind_list[i].value;
		}
		new_ind_list[i].nb_bits = old_ind_list[i].nb_bits;
		}

		/* reset nb_bits of all other indices to -1 */
		for ( ; i < max_num_indices; i++ )
		{
		new_ind_list[i].nb_bits = -1;
		}

		/* update parameters in all SCE elements */
		for ( n = 0; n < st_ivas->nSCE; n++ )
		{
		/* get the pointer to hBstr */
		if ( is_metadata )
		{
		hBstr = st_ivas->hSCE[n]->hMetaData;
		}
		else
		{
		hBstr = st_ivas->hSCE[n]->hCoreCoder[0]->hBstr;
		}

		if ( hBstr != NULL )
		{
		/* get the current position inside the old list */
		ind_list_pos = (int16_t) ( hBstr->ind_list - old_ind_list );

		/* set pointers in the new list */
		*( hBstr->ivas_ind_list_zero ) = new_ind_list;
		hBstr->ind_list = &new_ind_list[ind_list_pos];

		/* set the new maximum number of indices */
		*( hBstr->ivas_max_num_indices ) = max_num_indices;
		}
		}

		/* update parameters in all CPE elements */
		for ( n = 0; n < st_ivas->nCPE; n++ )
		{
		/* get the pointer to hBstr */
		if ( is_metadata )
		{
		n_channels = 1;
		}
		else
		{
		n_channels = CPE_CHANNELS;
		}

		for ( ch = 0; ch < n_channels; ch++ )
		{
		if ( is_metadata )
		{
		hBstr = st_ivas->hCPE[n]->hMetaData;
		}
		else
		{
		hBstr = st_ivas->hCPE[n]->hCoreCoder[ch]->hBstr;
		}

		if ( hBstr != NULL )
		{
		/* get the current position inside the old list */
		ind_list_pos = (int16_t) ( hBstr->ind_list - old_ind_list );

		/* set pointers in the new list */
		*( hBstr->ivas_ind_list_zero ) = new_ind_list;
		hBstr->ind_list = &new_ind_list[ind_list_pos];

		/* set the new maximum number of indices */
		*( hBstr->ivas_max_num_indices ) = max_num_indices;
		}
		}
		}

		/* free the old list */
		free( old_ind_list );

		return IVAS_ERR_OK;
		}

		#else

		ivas_error ind_list_realloc(
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		const int16_t max_num_indices /* i : new maximum number of allowed indices in the list */
		@@ -216,6 +341,8 @@ ivas_error ind_list_realloc(
		return IVAS_ERR_OK;
		}

		#endif


		/-----------------------------------------------------------------------
		* get_ivas_max_num_indices()
		@@ -468,6 +595,7 @@ int16_t get_core_max_num_indices(
		const int32_t total_brate /* i : total bitrate */
		)
		{

		/* set the maximum number of indices in the core coder */
		if ( core == ACELP_CORE \|\| core == AMR_WB_CORE )
		{
		@@ -866,7 +994,11 @@ ivas_error check_ind_list_limits(
		#endif

		/* reallocate the buffer of indices with increased limit */
		#ifdef FIX_MEM_REALLOC_IND_LIST
		if ( ( error = ind_list_realloc( hBstr->ivas_ind_list_zero, ( hBstr->ivas_max_num_indices ) + STEP_MAX_NUM_INDICES, hBstr->st_ivas ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ind_list_realloc( hBstr, *( hBstr->ivas_max_num_indices ) + STEP_MAX_NUM_INDICES ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -894,7 +1026,11 @@ ivas_error check_ind_list_limits(
		#endif

		/* no available empty slot -> need to re-allocate the buffer */
		#ifdef FIX_MEM_REALLOC_IND_LIST
		if ( ( error = ind_list_realloc( hBstr->ivas_ind_list_zero, ( hBstr->ivas_max_num_indices ) + STEP_MAX_NUM_INDICES, hBstr->st_ivas ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ind_list_realloc( hBstr, *( hBstr->ivas_max_num_indices ) + STEP_MAX_NUM_INDICES ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}

lib_com/options.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,6 @@
		/#define DEBUG_BINAURAL_FILTER_DESIGN/ /* debugging of Crend binaural filter design */
		/#define DEBUG_AGC_ENCODER_CMD_OPTION/ /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */
		#define DEBUG_JBM_CMD_OPTION /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */

		#define VARIABLE_SPEED_DECODING /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */

		#endif
		@@ -165,9 +164,12 @@
		#define FIX_575_LOW_OVERLAP_PLC_RECOVERY /* FhG: Issue 575 fix for PLC and transistion to TCX5*/
		#define ISM_FB_16k4 /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */
		#define FIX_580_PARAMMC_ENER_BURSTS /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */
		#define FIX_570_SF_EXT_ORIENTATION
		#define FIX_593_STL_INCLUDE /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */
		#define FIX_583_CLANG_TRANS_DET /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */
		#define NONBE_FIX_589_JBM_TC_OFFSETS /* FhG: issue 589: wrong offset into the TC buffers is used in some rendering paths in the JBM main rendering function */
		#define FIX_MEM_REALLOC_IND_LIST /* VA: issue 601: failure of the automatic memory re-allocation mechanism when ind_list[] buffer is depleted in MASA mode with 2 TC*/
		#define FIX_581_CLANG_OFFSET_TO_NULL /* FhG: issue 581: fix CLANG error about applying an offset to a NULL pointer */
		#define JBM_PARAMUPMIX /* Dlb: Issue 471: Integrate the Multichannel Parametric Upmix into the JBM path */

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

lib_com/prot.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -538,10 +538,18 @@ int16_t get_ivas_max_num_indices_metadata(
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

		#ifdef FIX_MEM_REALLOC_IND_LIST
		ivas_error ind_list_realloc(
		INDICE_HANDLE old_ind_list, /* i : pointer to the beginning of the old buffer of indices */
		const int16_t max_num_indices, /* i : new maximum number of allowed indices in the list */
		Encoder_Struct st_ivas / i : IVAS encoder structure */
		);
		#else
		ivas_error ind_list_realloc(
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		const int16_t max_num_indices /* i : new maximum number of allowed indices in the list */
		);
		#endif

		ivas_error check_ind_list_limits(
		BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle */

lib_enc/init_enc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,9 @@ ivas_error init_encoder(
		st->hBstr->ivas_max_num_indices = &st_ivas->ivas_max_num_indices;
		st->hBstr->nb_ind_tot = 0;
		st->hBstr->nb_bits_tot = 0;
		#ifdef FIX_MEM_REALLOC_IND_LIST
		st->hBstr->st_ivas = st_ivas;
		#endif
		}
		else
		{

lib_enc/ivas_corecoder_enc_reconfig.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -468,6 +468,9 @@ ivas_error ivas_corecoder_enc_reconfig(
		st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->ivas_max_num_indices = &st_ivas->ivas_max_num_indices_metadata;
		st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->nb_ind_tot = 0;
		st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->nb_bits_tot = 0;
		#ifdef FIX_MEM_REALLOC_IND_LIST
		st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->st_ivas = st_ivas;
		#endif
		}

		reset_indices_enc( st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData, st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->nb_ind_tot );