Merge branch 'cleanup_20230927' into 'main' (832d7978) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -439,9 +439,7 @@ int main(
		#ifdef FIX_708_DPID_COMMAND_LINE
		arg.Opt_dpid_on,
		#endif
		#ifdef FIX_708_AEID_COMMAND_LINE
		arg.acousticEnvironmentId,
		#endif
		arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -658,11 +656,7 @@ int main(
		goto cleanup;
		}
		}
		#ifdef FIX_708_AEID_COMMAND_LINE
		else
		#else
		else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )
		#endif
		{
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );
		goto cleanup;
		@@ -1034,11 +1028,7 @@ static bool parseCmdlIVAS_dec(
		arg->noBadFrameDelay = false;
		#endif
		#endif
		#ifdef FIX_708_AEID_COMMAND_LINE
		arg->acousticEnvironmentId = 65535;
		#else
		arg->acousticEnvironmentId = 0;
		#endif
		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		{
		#ifdef FIX_730_DPID_NOT_SET_CORRECTLY
		@@ -1417,7 +1407,6 @@ static bool parseCmdlIVAS_dec(
		else if ( strcmp( argv_to_upper, "-AEID" ) == 0 )
		{
		++i;
		#ifdef FIX_708_AEID_COMMAND_LINE
		if ( argc - i <= 4 )
		{
		fprintf( stderr, "Error: Acoustic environment ID not specified!\n\n" );
		@@ -1431,7 +1420,6 @@ static bool parseCmdlIVAS_dec(
		usage_dec();
		return false;
		}
		#endif
		arg->acousticEnvironmentId = (int16_t) atoi( argv[i++] );
		}
		else if ( strcmp( argv_to_upper, "-DPID" ) == 0 )
		@@ -2481,18 +2469,11 @@ static ivas_error decodeG192(
		{
		// update_mem(); TODO: verify this
		update_wmops();
		#ifdef FIX_RAM_COUNTING_5MS_RENDERING
		update_mem();
		#ifdef MEM_COUNT_DETAILS
		export_mem( "mem_analysis.csv" );
		#endif
		#endif
		}
		#ifndef FIX_RAM_COUNTING_5MS_RENDERING
		#ifdef MEM_COUNT_DETAILS
		export_mem( "mem_analysis.csv" );
		#endif
		#endif
		#endif
		}

apps/renderer.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -2647,11 +2647,7 @@ static CmdlnArgs defaultArgs(
		#endif
		}

		#ifdef FIX_708_AEID_COMMAND_LINE
		args.acousticEnvironmentId = 65535;
		#else
		args.acousticEnvironmentId = 0;
		#endif

		return args;
		}
		@@ -2819,13 +2815,11 @@ static void parseOption(
		break;
		case CmdLnOptionId_acousticEnvironmentId:
		assert( numOptionValues == 1 );
		#ifdef FIX_708_AEID_COMMAND_LINE
		if ( !is_digits_only( optionValues[0] ) )
		{
		fprintf( stderr, "Invalid acousting environment ID specified: %s\n", optionValues[0] );
		exit( -1 );
		}
		#endif
		args->acousticEnvironmentId = (int16_t) strtol( optionValues[0], NULL, 10 );
		break;
		case CmdLnOptionId_syncMdDelay:

lib_com/bits_alloc.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -476,10 +476,8 @@ static ivas_error acelp_FCB_allocator(
		}

		/* try to increase the FCB of the first subframe in cases when the next step is lower than the current step */
		#ifdef NONBE_FIX_694_OMASA_ACELP
		if ( fixed_cdk_index[sfr] < ACELP_FIXED_CDK_NB - 1 )
		{
		#endif
		step = fcb_table( fixed_cdk_index[sfr] + 1, L_subfr ) - fcb_table( fixed_cdk_index[sfr], L_subfr );
		if ( *nBits >= step && cdbk >= 0 )
		{
		@@ -493,9 +491,7 @@ static ivas_error acelp_FCB_allocator(
		*nBits -= step;
		}
		}
		#ifdef NONBE_FIX_694_OMASA_ACELP
		}
		#endif
		}
		/* TRANSITION coding: allocate highest FCBQ bit-budget to the subframe with the glottal-shape codebook */
		if ( tc_subfr >= L_SUBFR )

lib_com/bitstream.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -2738,11 +2738,7 @@ ivas_error preview_indices(
		/* Read SBA planar flag and SBA order */
		st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS] == 1 );

		#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT
		if ( total_brate >= IVAS_256k )
		#else
		if ( total_brate > IVAS_256k )
		#endif
		{
		st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS + 2] == 1 );
		st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS + 1] == 1 );

lib_com/ivas_cnst.h

+0 −26

Original line number	Diff line number	Diff line
		@@ -153,11 +153,7 @@ typedef enum
		#define MAX_SCE MAX_NUM_OBJECTS /* max. number of SCEs */
		#define MAX_CPE ( MAX_TRANSPORT_CHANNELS / CPE_CHANNELS ) /* max. number of CPEs */

		#ifdef FIX_747_ISM_TODOS
		#define MAX_BITS_METADATA 2500 /* max. bit-budget of metadata */
		#else
		#define MAX_BITS_METADATA 2640 /* max. bit-budget of metadata, one channel / / IVAS_fmToDo: to be confirmed for final value once mature */
		#endif
		#define MIN_NUM_IND 10 /* minimum number of indices in the core coder */
		#define MAX_NUM_IND_LFE 100 /* maximum number of indices in the LFE encoder */
		#define MAX_NUM_IND_TEMP_LIST 10 /* maximum number of indices in the temporary list */
		@@ -369,9 +365,6 @@ typedef enum
		#define ISM_Q_STEP_LOW (ISM_Q_STEP * 2)
		#define ISM_Q_STEP_BORDER_LOW (ISM_Q_STEP_BORDER * 2)

		#ifndef FIX_747_ISM_TODOS
		#define BRATE_ISM_INACTIVE 2450 /* CoreCoder bitrate in ISM inactive frames */
		#endif
		/* ISM modes */
		typedef enum
		{
		@@ -407,15 +400,8 @@ enum
		IND_ISM_ELEVATION = TAG_ISM_LOOP_START,
		IND_ISM_RADIUS_DIFF_FLAG = TAG_ISM_LOOP_START,
		IND_ISM_RADIUS = TAG_ISM_LOOP_START,
		#ifdef FIX_747_ISM_TODOS
		TAG_ISM_LOOP_END = TAG_ISM_LOOP_START
		#else
		TAG_ISM_LOOP_END = TAG_ISM_LOOP_START + 100, /* IVAS_fmToDo: to be reviewed once the final metadata are defined */
		#endif
		/* --------- end of loop for objects ----------- */
		#ifndef FIX_747_ISM_TODOS
		ISM_MAX_NUM_INDICES
		#endif

		};

		@@ -1195,11 +1181,7 @@ enum

		#define QMETADATA_MAXBIT_REQ_MASA 900 /* max bit-bit/direction for avoiding requantization in MASA path */
		#define QMETADATA_MAXBIT_REQ_SBA 400 /* max bit-bit/direction for avoiding requantization in SBA path */
		#ifdef NONBE_FIX_760_COHERENCE_MASA
		#define MASA_COH_LIMIT_2IDX 96 /* limit for sum of values across components for having two joint indexes */
		#else
		#define MASA_COH_LIMIT_2IDX 144 /* limit for sum of values across components for having two joint indexes */
		#endif
		#define QMETADATA_MAX_NO_DIRECTIONS 2
		#define MASA_MAX_BITS 1300 /* max. bit-budget for MASA metadata */

		@@ -1527,16 +1509,8 @@ typedef enum

		#define BINAURAL_MAXBANDS 60 /* Max number of bands */
		#define BINAURAL_CONVBANDS 50 /* Bands upto which convolution is performed */
		#ifdef NONBE_FIX_588_UPDATE_FASTCONV_SD
		#define BINAURAL_NTAPS 3
		#else
		#define BINAURAL_NTAPS 5
		#endif
		#ifdef NONBE_FIX_588_UPDATE_FASTCONV_SD
		#define BINAURAL_NTAPS_SBA BINAURAL_NTAPS
		#else
		#define BINAURAL_NTAPS_SBA 3
		#endif

		#define BINAURAL_NTAPS_MAX 96