- Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 1899-ref-PortFlpMr1645 (e9923ab8) · Commits · SA4 / Audio / IVAS BASOP

apps/encoder.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -1586,6 +1586,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Too low number of ISM channels specified!\n\n" );
		usage_enc();
		return false;
		}
		else
		{
		@@ -1597,6 +1598,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Too high number of ISM channels!\n\n" );
		usage_enc();
		return false;
		}
		}
		}
		@@ -1604,6 +1606,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Number of ISM channels not specified!\n\n" );
		usage_enc();
		return false;
		}
		if ( i < argc - 4 )
		{
		@@ -1623,7 +1626,7 @@ static bool parseCmdlIVAS_enc(
		default:
		fprintf( stderr, "Error: MASA channels must be 1 or 2.\n\n" );
		usage_enc();
		break;
		return false;
		}
		}

		@@ -1648,6 +1651,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: not enough arguments\n\n" );
		usage_enc();
		return false;
		}
		}

		@@ -1660,6 +1664,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: not enough MASA arguments\n\n" );
		usage_enc();
		return false;
		}
		}
		else if ( strcmp( to_upper( argv[i] ), "-ISM_SBA" ) == 0 )
		@@ -1678,6 +1683,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Too low number of ISM channels specified!\n\n" );
		usage_enc();
		return false;
		}
		else
		{
		@@ -1689,6 +1695,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Too high number of ISM channels!\n\n" );
		usage_enc();
		return false;
		}
		}
		}
		@@ -1696,6 +1703,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Number of ISM channels not specified!\n\n" );
		usage_enc();
		return false;
		}

		if ( i < argc - 4 )
		@@ -1747,6 +1755,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: not enough arguments\n\n" );
		usage_enc();
		return false;
		}
		}
		}

lib_com/ivas_cnst.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -183,7 +183,9 @@ typedef enum

		typedef enum
		{
		#ifndef FIX_1101_CLEANING_JBM_CALL
		TC_BUFFER_MODE_NONE = 0,
		#endif
		TC_BUFFER_MODE_RENDERER,
		TC_BUFFER_MODE_BUFFER
		} TC_BUFFER_MODE;

lib_com/ivas_prot.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -3085,7 +3085,11 @@ void mctStereoIGF_enc(
		MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
		Encoder_State *sts, / i/o: encoder state structure */
		float orig_spectrum[MCT_MAX_CHANNELS][NB_DIV], / i : MDCT spectrum for ITF */
		#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC
		float powerSpec[MCT_MAX_CHANNELS], / i/o: MDCT^2 + MDST^2 spectrum,or estimate */
		#else
		float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k], /* i/o: MDCT^2 + MDST^2 spectrum,or estimate */
		#endif
		float powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV], / i : same as above but for inverse spect. */
		float inv_spectrum[MCT_MAX_CHANNELS][NB_DIV], / i : inverse spectrum */
		const int16_t sp_aud_decision0[MCT_MAX_CHANNELS] /* i : speech audio decision */

lib_com/ivas_rom_com.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -2473,6 +2473,13 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_
		* MASA ROM tables
		----------------------------------------------------------------------------------/

		#ifdef FIX_1121_MASA_DESCRIPTOR
		const uint8_t ivasmasaFormatDescriptor[8] =
		{
		0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */
		};

		#endif
		const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =
		{
		0.00f,

lib_com/ivas_rom_com.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -264,6 +264,10 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PA
		* MASA ROM tables
		----------------------------------------------------------------------------------/

		#ifdef FIX_1121_MASA_DESCRIPTOR
		extern const uint8_t ivasmasaFormatDescriptor[8]; /* "IVASMASA" */

		#endif
		extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];
		extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];
		extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];