Merge pull request #1037 from mstorsjo/unify-align-macros

Unify macros for alignment

zhilwang committed 12 years ago

Commit 2b038fa2 parents e9b8d92 263833b9 files · +11 −21Browse files

Showing the changes to codec/decoder (2 of 9 files). Show all

Unified · Split

2 files

codec/decoder/core/inc/wels_common_basis.h +1 −1
codec/decoder/core/src/decoder_data_tables.cpp +1 −1

codec/decoder/core/inc/wels_common_basis.h+1−1

@@ -47,7 +47,7 @@ extern const uint8_t g_kuiChromaQp[52]; · 46 unmodified lines
47	extern const uint8_t g_kuiScan8[24];	47	extern const uint8_t g_kuiScan8[24];
48	extern const uint8_t g_kuiLumaDcZigzagScan[16];	48	extern const uint8_t g_kuiLumaDcZigzagScan[16];
49	extern const uint8_t g_kuiChromaDcScan[4];	49	extern const uint8_t g_kuiChromaDcScan[4];
50	extern __align16 (const uint16_t, g_kuiDequantCoeff[52][8]);	50	extern ALIGNED_DECLARE (const uint16_t, g_kuiDequantCoeff[52][8], 16);
51	/* Profile IDC */	51	/* Profile IDC */
52	typedef uint8_t ProfileIdc;	52	typedef uint8_t ProfileIdc;
53	enum {	53	enum {

codec/decoder/core/src/decoder_data_tables.cpp+1−1

@@ -155,7 +155,7 @@ const uint8_t g_kuiChromaDcScan[4] = { · 154 unmodified lines
155	0, 16, 32, 48	155	0, 16, 32, 48
156	};	156	};
157		157
158	__align16 (const uint16_t, g_kuiDequantCoeff[52][8]) = {	158	ALIGNED_DECLARE (const uint16_t, g_kuiDequantCoeff[52][8], 16) = {
159	/* 0/{ 10, 13, 10, 13, 13, 16, 13, 16 }, / 1*/{ 11, 14, 11, 14, 14, 18, 14, 18 },	159	/* 0/{ 10, 13, 10, 13, 13, 16, 13, 16 }, / 1*/{ 11, 14, 11, 14, 14, 18, 14, 18 },
160	/* 2/{ 13, 16, 13, 16, 16, 20, 16, 20 }, / 3*/{ 14, 18, 14, 18, 18, 23, 18, 23 },	160	/* 2/{ 13, 16, 13, 16, 16, 20, 16, 20 }, / 3*/{ 14, 18, 14, 18, 18, 23, 18, 23 },
161	/* 4/{ 16, 20, 16, 20, 20, 25, 20, 25 }, / 5*/{ 18, 23, 18, 23, 23, 29, 23, 29 },	161	/* 4/{ 16, 20, 16, 20, 20, 25, 20, 25 }, / 5*/{ 18, 23, 18, 23, 23, 29, 23, 29 },