Merge branch 'main' into 685-ism4-decoder-detects-ber (58302820) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+5 −2

Original line number	Diff line number	Diff line
		@@ -1476,11 +1476,14 @@ upload-selection-BE-log:
		script:
		- cp -r $SELECTION_BE_RESULT ./selection-BE-result
		- Get-Content -Path selection-BE-result/public_log--sha-*.txt
		- $has_failed = (Select-String -Path selection-BE-result/public_log--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line
		- If($has_failed) {exit -1}
		- $has_failed_debugging_active = (Select-String -Path selection-BE-result/public_log--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line
		- Get-Content -Path selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt
		- $has_failed_debugging_inactive = (Select-String -Path selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line
		- If($has_failed_debugging_active -or $has_failed_debugging_inactive) {exit -1}
		artifacts:
		paths:
		- selection-BE-result/public_log--sha-*.txt
		- selection-BE-result/public_log_DEBUGGING_inactive--sha-*.txt
		when: always
		expire_in: 1 week

+7 −0

Original line number	Diff line number	Diff line
		@@ -2891,6 +2891,13 @@ cleanup:
		#ifdef SUPPORT_JBM_TRACEFILE
		JbmTraceFileWriter_close( &jbmTraceWriter );
		#endif
		#ifdef FIX_683_JBM_CLEANUP
		MasaFileWriter_close( &masaWriter );
		for ( int16_t i = 0; i < IVAS_MAX_NUM_OBJECTS; i++ )
		{
		IsmFileWriter_close( &ismWriters[i] );
		}
		#endif

		if ( decodingFailed && error == IVAS_ERR_OK )
		{

+44 −17

Original line number	Diff line number	Diff line
		@@ -394,6 +394,9 @@ static ivas_error acelp_FCB_allocator(
		int16_t nBits_tmp;
		int16_t *p_fixed_cdk_index;
		ivas_error error;
		#ifdef FIX_680_ACELP_TABLE_OMASA
		int16_t max_n;
		#endif

		error = IVAS_ERR_OK;

		@@ -424,13 +427,31 @@ static ivas_error acelp_FCB_allocator(
		}

		/* distribute the bit-budget equally between subframes */
		#ifdef FIX_680_ACELP_TABLE_OMASA
		if ( L_subfr > L_SUBFR ) /* access fast_FCB_bits_2sfr */
		{
		max_n = 6;
		}
		else
		{
		max_n = ACELP_FIXED_CDK_NB;
		}
		for ( cdbk = 0; cdbk < max_n; cdbk++ )
		{
		if ( fcb_table( cdbk, L_subfr ) * nb_subfr > *nBits )
		{
		break;
		}
		}
		cdbk--;
		#else
		cdbk = 0;
		while ( fcb_table( cdbk, L_subfr ) * nb_subfr <= *nBits )
		{
		cdbk++;
		}
		cdbk--;

		#endif
		#ifdef DEBUGGING
		if ( cdbk < 0 && coder_type != TRANSITION )
		{
		@@ -455,6 +476,10 @@ static ivas_error acelp_FCB_allocator(
		nBits -= nBits_tmp nb_subfr;

		/* try to increase the FCB bit-budget of the first subframe(s) */
		#ifdef FIX_680_ACELP_TABLE_OMASA
		if ( cdbk < ACELP_FIXED_CDK_NB - 1 )
		{
		#endif
		step = fcb_table( cdbk + 1, L_subfr ) - nBits_tmp;
		while ( *nBits >= step )
		{
		@@ -477,7 +502,9 @@ static ivas_error acelp_FCB_allocator(
		*nBits -= step;
		}
		}

		#ifdef FIX_680_ACELP_TABLE_OMASA
		}
		#endif
		/* TRANSITION coding: allocate highest FCBQ bit-budget to the subframe with the glottal-shape codebook */
		if ( tc_subfr >= L_SUBFR )
		{

+0 −10

Original line number	Diff line number	Diff line
		@@ -1084,12 +1084,7 @@ ivas_error check_ind_list_limits(
		if ( ( &hBstr->ind_list[hBstr->nb_ind_tot] - ivas_ind_list_zero ) >= *( hBstr->ivas_max_num_indices ) )
		{
		#ifdef DEBUGGING
		#ifdef DEBUG_IND_LIST_MEMORY
		/* TODO: replace with the warning message below before the finalization of the IVAS codec */
		assert( 0 && "The maximum number of indices has been exceeded! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata()." );
		#else
		fprintf( stderr, "Warning: The maximum number of indices %d has been exceeded in frame %d! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata().\n", *( hBstr->ivas_max_num_indices ), frame );
		#endif
		#endif

		/* reallocate the buffer of indices with increased limit */
		@@ -1121,12 +1116,7 @@ ivas_error check_ind_list_limits(
		if ( hBstr->ind_list >= ivas_ind_list_last )
		{
		#ifdef DEBUGGING
		#ifdef DEBUG_IND_LIST_MEMORY
		/* TODO: replace with the warning message below before the finalization of the IVAS codec */
		assert( 0 && "The maximum number of indices has been exceeded! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata()." );
		#else
		fprintf( stderr, "Warning: The maximum number of indices %d has been exceeded in frame %d! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata().\n", *( hBstr->ivas_max_num_indices ), frame );
		#endif
		#endif

		/* no available empty slot -> need to re-allocate the buffer */

+2 −2

Original line number	Diff line number	Diff line
		@@ -119,8 +119,8 @@ typedef enum
		AUDIO_CONFIG_ISM2, /* ISM2 */
		AUDIO_CONFIG_ISM3, /* ISM3 */
		AUDIO_CONFIG_ISM4, /* ISM4 */
		AUDIO_CONFIG_MASA1, /* MASA1 */ // TODO: seems not to be used
		AUDIO_CONFIG_MASA2, /* MASA2 */ // TODO: seems not to be used
		AUDIO_CONFIG_MASA1, /* MASA1 */
		AUDIO_CONFIG_MASA2, /* MASA2 */
		AUDIO_CONFIG_EXTERNAL /* external renderer */

		} AUDIO_CONFIG;