fix formatting (1fc47fa6) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

+10 −9

Original line number	Diff line number	Diff line
		@@ -61,7 +61,8 @@ static
		#define DEFAULT_FIXED_SID_RATE 8 /* DTX SID rate */

		/* Additional config info for each input format */
		typedef union _EncInputFormatConfig {
		typedef union _EncInputFormatConfig
		{
		/* MONO details */
		bool stereoToMonoDownmix;

lib_util/ambi_convert.c

+42 −49

Original line number	Diff line number	Diff line
		@@ -64,20 +64,17 @@
		static const float N3D_SN3D[AMBI_MAX_CHANNELS] = { 1.0f,
		SQRT_3_, SQRT_3_, SQRT_3_,
		SQRT_5_, SQRT_5_, SQRT_5_, SQRT_5_, SQRT_5_,
		SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_
		};
		SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_, SQRT_7_ };

		static const float SN3D_N3D[AMBI_MAX_CHANNELS] = { 1.0f,
		INV_SQRT_3_, INV_SQRT_3_, INV_SQRT_3_,
		INV_SQRT_5_, INV_SQRT_5_, INV_SQRT_5_, INV_SQRT_5_, INV_SQRT_5_,
		INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_
		};
		INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_, INV_SQRT_7_ };

		static const float MAXN_SN3D[AMBI_MAX_CHANNELS] = { 1.0f,
		1.0f, 1.0f, 1.0f,
		TWO_OVER_SQRT_3_, TWO_OVER_SQRT_3_, 1, TWO_OVER_SQRT_3_, TWO_OVER_SQRT_3_,
		SQRT_8_OVER_5_, SQRT_3_OVER_5_, SQRT_45_OVER_32_, 1, SQRT_45_OVER_32_, SQRT_3_OVER_5_, SQRT_8_OVER_5_
		};
		SQRT_8_OVER_5_, SQRT_3_OVER_5_, SQRT_45_OVER_32_, 1, SQRT_45_OVER_32_, SQRT_3_OVER_5_, SQRT_8_OVER_5_ };

		static const float SN3D_MAXN[AMBI_MAX_CHANNELS] = { 1.0f,
		1.0f, 1.0f, 1.0f,
		@@ -101,26 +98,22 @@ static const float FM_MAXN[AMBI_MAX_CHANNELS] = { INV_SQRT_2,
		static const int16_t REORDER_FM_ACN[AMBI_MAX_CHANNELS] = { 0,
		2, 3, 1,
		8, 6, 4, 5, 7,
		15, 13, 11, 9, 10, 12, 14
		};
		15, 13, 11, 9, 10, 12, 14 };

		static const int16_t REORDER_SID_ACN[AMBI_MAX_CHANNELS] = { 0,
		2, 3, 1,
		5, 7, 8, 6, 4,
		10, 12, 14, 15, 13, 11, 9
		};
		10, 12, 14, 15, 13, 11, 9 };

		static const int16_t REORDER_ACN_FM[AMBI_MAX_CHANNELS] = { 0,
		3, 1, 2,
		6, 7, 5, 8, 4,
		12, 13, 11, 14, 10, 15, 9
		};
		12, 13, 11, 14, 10, 15, 9 };

		static const int16_t REORDER_ACN_SID[AMBI_MAX_CHANNELS] = { 0,
		3, 1, 2,
		8, 4, 7, 5, 6,
		15, 9, 14, 10, 13, 11, 12
		};
		15, 9, 14, 10, 13, 11, 12 };

		/* ----------------------------------
		API functions for the conversion

lib_util/ambi_convert.h

+6 −8

Original line number	Diff line number	Diff line
		@@ -62,5 +62,3 @@ int16_t convert_ambi_format(float in[][L_FRAME48k], float out[][L_FRAME48k], int
		int16_t renormalize_channels( float in[][L_FRAME48k], float out[][L_FRAME48k], int16_t order, AMBI_CHANNEL_NORM in_format, AMBI_CHANNEL_NORM out_format );

		int16_t reorder_channels( float in[][L_FRAME48k], float out[][L_FRAME48k], int16_t order, AMBI_CHANNEL_ORDER in_format, AMBI_CHANNEL_ORDER out_format );

lib_enc/ivas_enc.c

+291 −291

File changed.

Contains only whitespace changes.

lib_enc/lib_enc.c

+1 −1

File changed.

Contains only whitespace changes.