[cleanup] accept HR_METADATA (0167332b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -1186,9 +1186,7 @@ enum
		#define MASA_DIRECTION_MAX_BITS 11
		#define MASA_NO_INDEX 32767
		#define MASA_BITS_ER 3
		#ifdef HR_METADATA
		#define MASA_BITS_ER_HR 4
		#endif
		#define MASA_MIN_BITS_TF 4
		#define MASA_LIMIT_2D 2
		#define MASA_NO_CV_COH 8
		@@ -1208,10 +1206,8 @@ enum
		#define QMETADATA_MAX_NO_DIRECTIONS 2
		#define MASA_MAX_BITS 1300 /* max. bit-budget for MASA metadata */

		#ifdef HR_METADATA
		#define MASA_MAX_BITS_HR 2000 /* max. bit-budget for MASA metadata in HR mode*/
		#define HR_MASA_ER_LEVELS 16
		#endif
		#ifdef FIX_HBR_MASAMETA
		#define MAX_REDUCED_NBANDS 18 /* max number of subbands that is less than the default value 24 */
		#endif
		@@ -1246,12 +1242,8 @@ enum
		#define MASA_STEREO_MIN_BITRATE IVAS_24k4

		#define MASA_BIT_REDUCT_PARAM 10
		#ifdef HR_METADATA
		#define MASA_MAXIMUM_TWO_DIR_BANDS 24
		#define NBITS_HR_COH 4
		#else
		#define MASA_MAXIMUM_TWO_DIR_BANDS 18
		#endif
		typedef enum
		{
		MASA_STEREO_NOT_DEFINED,

+0 −4

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@
		#define MASA_SMALL_INC_META_BITS 10


		#ifdef HR_METADATA
		/*---------------------------------------------------------------
		* Local prototypes
		---------------------------------------------------------------/
		@@ -62,7 +61,6 @@ static int16_t quantize_theta_masa( float x, const int16_t no_cb, float *xhat );

		static int16_t quantize_phi_masa( float phi, const int16_t flag_delta, float *phi_hat, const int16_t n );

		#endif


		/*---------------------------------------------------------------
		@@ -454,7 +452,6 @@ void masa_sample_rate_band_correction(
		}


		#ifdef HR_METADATA
		/*-------------------------------------------------------------------------
		* index_theta_phi_16()
		*
		@@ -803,4 +800,3 @@ void deindex_sph_idx(

		return;
		}
		#endif

+0 −6

Original line number	Diff line number	Diff line
		@@ -3109,7 +3109,6 @@ ivas_error ivas_qmetadata_enc_encode(
		const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */
		);

		#ifdef HR_METADATA
		ivas_error ivas_qmetadata_enc_encode_hr_384_512(
		BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
		IVAS_QMETADATA hQMetaData, / i/o: metadata handle */
		@@ -3130,7 +3129,6 @@ uint16_t index_theta_phi_16(
		float * p_phi, /* i/o: input azimuth to be indexed */
		const SPHERICAL_GRID_DATA gridData / i : generated grid data */
		);
		#endif

		void reset_metadata_spatial(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		@@ -3166,7 +3164,6 @@ int16_t ivas_qmetadata_dec_decode(
		const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */
		);

		#ifdef HR_METADATA
		/! r: number of bits read /
		int16_t ivas_qmetadata_dec_decode_hr_384_512(
		IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: hQMetaData handle */
		@@ -3180,7 +3177,6 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512(
		uint8_t ncoding_bands_config
		#endif
		);
		#endif

		/! r: number of bits read /
		int16_t ivas_qmetadata_dec_sid_decode(
		@@ -3266,10 +3262,8 @@ void quantize_direction_frame(
		IVAS_QDIRECTION q_direction, / i/o: quantized direction structure */
		float azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES],
		float elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES]
		#ifdef HR_METADATA
		,
		const int16_t hrmasa_flag /* i : flag indicating high-rate MASA MD coding*/
		#endif
		);

		/! r: quantized spherical index /

+0 −6

Original line number	Diff line number	Diff line
		@@ -2538,7 +2538,6 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_
		/----------------------------------------------------------------------------------
		* MASA ROM tables
		----------------------------------------------------------------------------------/
		#ifdef HR_METADATA

		const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =
		{
		@@ -2579,7 +2578,6 @@ const float diffuseness_thresholds_hr[HR_MASA_ER_LEVELS + 1] =
		0.8673095703125f,
		2.0f /* out-of-range large value to make searching easier */
		};
		#endif
		const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS] =
		{
		11,
		@@ -2775,11 +2773,7 @@ const uint8_t masa_joined_nbands[IVAS_NUM_ACTIVE_BRATES] =

		const uint8_t masa_twodir_bands[IVAS_NUM_ACTIVE_BRATES] =
		{
		#ifdef HR_METADATA
		0, 0, 0, 0, 0, 1, 1, 1, 3, 4, 6, 6, 9, 24
		#else
		0, 0, 0, 0, 0, 1, 1, 1, 3, 4, 6, 6, 9, 12
		#endif
		};

		const uint8_t masa_twodir_bands_joined[IVAS_NUM_ACTIVE_BRATES] =

+0 −2

Original line number	Diff line number	Diff line
		@@ -298,10 +298,8 @@ extern const uint8_t masa_joined_nbands[];
		extern const uint8_t masa_twodir_bands[];
		extern const uint8_t masa_twodir_bands_joined[];

		#ifdef HR_METADATA
		extern const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS];
		extern const float diffuseness_thresholds_hr[HR_MASA_ER_LEVELS + 1];
		#endif

		/* Multi-channel input and output setups */
		extern const float ls_azimuth_CICP2[2];