Merge branch 'main' into dlb_sba_encoder_complexity_opt (145c1b42) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -1130,18 +1130,31 @@ static bool parseCmdlIVAS_enc(
		{
		strncpy( stmp, argv[i], sizeof( stmp ) );
		stmp[sizeof( stmp ) - 1] = '\0';
		#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING
		to_upper( stmp );
		if ( strcmp( stmp, "LO" ) == 0 )
		#else
		to_upper( argv[i] );
		if ( strcmp( argv[i], "LO" ) == 0 )
		#endif
		{
		arg->caConfig.fec_indicator = IVAS_ENC_FEC_LO;
		}
		#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING
		else if ( strcmp( stmp, "HI" ) == 0 )
		#else
		else if ( strcmp( argv[i], "HI" ) == 0 )
		#endif
		{
		arg->caConfig.fec_indicator = IVAS_ENC_FEC_HI;
		}
		else
		{
		#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING
		arg->ca_config_file = argv[i];
		#else
		arg->ca_config_file = stmp;
		#endif
		}
		i++;

+25 −15

Original line number	Diff line number	Diff line
		@@ -1914,7 +1914,11 @@ ivas_error preview_indices(
		k = IVAS_FORMAT_SIGNALING_NBITS;
		if ( st_ivas->ivas_format == MASA_FORMAT )
		{
		#ifdef COMBINED_FORMAT_SIGNALING
		k = IVAS_FORMAT_SIGNALING_NBITS_EXTENDED;
		#else
		k = IVAS_FORMAT_SIGNALING_NBITS_SBA;
		#endif
		}

		if ( total_brate < MIN_BRATE_MDCT_STEREO )
		@@ -1954,9 +1958,15 @@ ivas_error preview_indices(
		else if ( st_ivas->ivas_format == SBA_FORMAT )
		{
		/* Read SBA planar flag and SBA order */
		#ifdef COMBINED_FORMAT_SIGNALING
		st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED] == 1 );
		st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 2] == 1 );
		st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 1] == 1 );
		#else
		st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA] == 1 );
		st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 );
		st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 );
		#endif

		st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( total_brate, st_ivas->sba_order );

+4 −0

Original line number	Diff line number	Diff line
		@@ -78,7 +78,11 @@ typedef enum
		----------------------------------------------------------------------------------/

		#define IVAS_FORMAT_SIGNALING_NBITS 2 /* number of bits for signaling the IVAS format */
		#ifdef COMBINED_FORMAT_SIGNALING
		#define IVAS_FORMAT_SIGNALING_NBITS_EXTENDED ( IVAS_FORMAT_SIGNALING_NBITS + 1 )
		#else
		#define IVAS_FORMAT_SIGNALING_NBITS_SBA ( IVAS_FORMAT_SIGNALING_NBITS + 1 )
		#endif


		/----------------------------------------------------------------------------------

+5 −0

Original line number	Diff line number	Diff line
		@@ -2154,8 +2154,13 @@ void ivas_spar_set_bitrate_config(
		max_bits += (int16_t) ( ivas_spar_br_table_consts[table_idx].core_brs[i][1] / FRAMES_PER_SEC );
		}

		#ifdef COMBINED_FORMAT_SIGNALING
		pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits;
		pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits;
		#else
		pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits;
		pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits;
		#endif

		md_coding_bits_header = SPAR_NUM_CODING_STRAT_BITS + pSpar_md_cfg->quant_strat_bits;

+3 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,9 @@ typedef struct ivas_param_ism_data_structure

		int16_t flag_noisy_speech;
		int16_t noisy_speech_buffer[PARAM_ISM_HYS_BUF_SIZE];
		#ifdef FIX_440_PARAM_ISM_DIR_NOISE
		int16_t flag_equal_energy;
		#endif

		} PARAM_ISM_CONFIG_DATA, *PARAM_ISM_CONFIG_HANDLE;