Merge branch 'main' into 92-spar-code-redundancies-2 (6809cafd) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

+28 −6

Original line number	Diff line number	Diff line
		@@ -120,11 +120,13 @@ typedef struct
		const char *ca_config_file;
		bool mimeOutput;

		#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
		#ifdef AGC_ENABLE_FOR_LBR
		IVAS_ENC_AGC agc;
		#else
		bool agc;
		#endif
		#endif /* AGC_ENABLE_FOR_LBR */
		#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */
		bool pca;
		#ifdef DEBUG_FOA_AGC
		FILE agcBitstream; / temporary */
		@@ -444,11 +446,25 @@ int main(
		}
		break;
		case IVAS_ENC_INPUT_SBA:
		if ( ( error =
		IVAS_ENC_ConfigureForAmbisonics(
		hIvasEnc,
		arg.inputFs,
		totalBitrate,
		arg.max_bwidth_user,
		bandwidth,
		arg.dtxConfig,
		arg.inputFormatConfig.sba.order,
		arg.inputFormatConfig.sba.isPlanar,
		#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
		arg.agc,
		#endif
		arg.pca
		#ifdef DEBUG_SBA_AUDIO_DUMP
		if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar, arg.agc, arg.pca, &numTransportChannels ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar, arg.agc, arg.pca ) ) != IVAS_ERR_OK )
		,
		&numTransportChannels
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_ENC_ConfigureForAmbisonics failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -874,11 +890,13 @@ static void initArgStruct( EncArguments *arg )
		arg->ca_config_file = NULL;
		arg->mimeOutput = false;

		#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
		#ifdef AGC_ENABLE_FOR_LBR
		arg->agc = IVAS_ENC_AGC_UNDEFINED;
		#else
		arg->agc = IVAS_DEFAULT_AGC;
		#endif
		#endif /* AGC_ENABLE_FOR_LBR */
		#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */
		arg->pca = false;
		#ifdef DEBUG_FOA_AGC
		arg->agcBitstream = NULL;
		@@ -1384,6 +1402,7 @@ static bool parseCmdlIVAS_enc(
		arg->inputFormatConfig.stereoToMonoDownmix = true;
		i++;
		}
		#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
		else if ( strcmp( argv_to_upper, "-AGC" ) == 0 )
		{
		i++;
		@@ -1409,6 +1428,7 @@ static bool parseCmdlIVAS_enc(
		return false;
		}
		}
		#endif
		else if ( strcmp( argv_to_upper, "-BYPASS" ) == 0 ) // VE: should be renamed to "-pca"
		{
		i++;
		@@ -1648,13 +1668,15 @@ static void usage_enc( void )
		#ifdef DEBUG_SBA
		fprintf( stdout, "-tag : Tag name for intermediate debug files\n" );
		#endif
		#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
		#ifdef AGC_ENABLE_FOR_LBR
		fprintf( stdout, "-agc op : SBA Adaptive gain control, op = (0, 1). \n" );
		fprintf( stdout, " By default op is 1 (activated) for bitrates between 24400 and 32000,\n" );
		fprintf( stdout, " otherwise it is 0 (deactivated) for all other bitrates\n" );
		#else
		fprintf( stdout, "-agc op : SBA Adaptive gain control, op = (0, 1), by default op is 0 or deactivated\n" );
		#endif
		#endif /* AGC_ENABLE_FOR_LBR */
		#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */

		fprintf( stdout, "-bypass mode : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1\n" );
		#ifdef DEBUGGING

lib_com/cnst.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,9 @@ enum{

		#define MAX_V_MULT_MAT 100 /* maximum array length for the function v_mult_mat() */

		#define SBA_AGC_FORCE_ENABLE 1
		#define SBA_AGC_FORCE_DISABLE 0
		#define SBA_AGC_DEFAULT -1

		/----------------------------------------------------------------------------------
		* Layers

lib_com/ivas_cnst.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -836,6 +836,9 @@ typedef enum {
		#define SBA_MIN_BRATE_HOA IVAS_256k
		#define SBA_NHARM_HOA3 16
		#define SBA_T_DESIGN_11_SIZE 70
		#ifdef FIX_SBA_DTX_DECODE_ERROR
		#define SBA_DTX_BITRATE_THRESHOLD IVAS_80k
		#endif

		typedef enum
		{

lib_com/ivas_error.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,9 @@ typedef enum
		IVAS_ERR_FILE_READER_TIMESTAMP_MISMATCH,
		IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT,
		IVAS_ERR_INVALID_MASA_FORMAT_METADATA_FILE,
		#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
		IVAS_ERR_INVALID_AGC,
		#endif

		/----------------------------------------
		* input data errors *

lib_com/ivas_prot.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -44,9 +44,6 @@
		#include "ivas_stat_dec.h"
		#include "ivas_stat_com.h"
		#include "ivas_error_utils.h"
		#ifdef AGC_ENABLE_FOR_LBR
		#include "lib_enc.h"
		#endif

		/* clang-format off */

		@@ -3757,8 +3754,11 @@ void ivas_sba_prototype_renderer(

		/* AGC */
		#ifdef AGC_ENABLE_FOR_LBR
		int16_t ivas_agc_enc_get_enablement_flag(
		IVAS_ENC_AGC agc_configuration, /* i : configuration used when encoder was initialised from cmd line */
		/! r: AGC enable flag /
		int16_t ivas_agc_enc_get_flag(
		#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
		int16_t agc_configuration, /* i : AGC configuration from command-line */
		#endif
		int16_t nchan_transport /* i : number of transport channels */
		);
		#endif