Skip to content

L
libswscale
Commit 281ba1ce authored by mru's avatar mru
Browse files
Options

Move array specifiers outside DECLARE_ALIGNED() invocations 

git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@30385 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 64c710b4
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
ppc/swscale_altivec_template.c
View file @ 281ba1ce
...@@ -93,7 +93,7 @@ yuv2yuvX_altivec_real(const int16_t *lumFilter, int16_t **lumSrc, int lumFilterS ...@@ -93,7 +93,7 @@ yuv2yuvX_altivec_real(const int16_t *lumFilter, int16_t **lumSrc, int lumFilterS
const vector signed int vini = {(1 << 18), (1 << 18), (1 << 18), (1 << 18)}; const vector signed int vini = {(1 << 18), (1 << 18), (1 << 18), (1 << 18)};
register int i, j; register int i, j;
{ {
DECLARE_ALIGNED(16, int, val[dstW]); DECLARE_ALIGNED(16, int, val)[dstW];
for (i = 0; i < (dstW -7); i+=4) { for (i = 0; i < (dstW -7); i+=4) {
vec_st(vini, i << 2, val); vec_st(vini, i << 2, val);
...@@ -141,8 +141,8 @@ yuv2yuvX_altivec_real(const int16_t *lumFilter, int16_t **lumSrc, int lumFilterS ...@@ -141,8 +141,8 @@ yuv2yuvX_altivec_real(const int16_t *lumFilter, int16_t **lumSrc, int lumFilterS
altivec_packIntArrayToCharArray(val, dest, dstW); altivec_packIntArrayToCharArray(val, dest, dstW);
} }
if (uDest != 0) { if (uDest != 0) {
DECLARE_ALIGNED(16, int, u[chrDstW]); DECLARE_ALIGNED(16, int, u)[chrDstW];
DECLARE_ALIGNED(16, int, v[chrDstW]); DECLARE_ALIGNED(16, int, v)[chrDstW];
for (i = 0; i < (chrDstW -7); i+=4) { for (i = 0; i < (chrDstW -7); i+=4) {
vec_st(vini, i << 2, u); vec_st(vini, i << 2, u);
...@@ -215,7 +215,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, ...@@ -215,7 +215,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW,
const int16_t *filterPos, int filterSize) const int16_t *filterPos, int filterSize)
{ {
register int i; register int i;
DECLARE_ALIGNED(16, int, tempo[4]); DECLARE_ALIGNED(16, int, tempo)[4];
if (filterSize % 4) { if (filterSize % 4) {
for (i=0; i<dstW; i++) { for (i=0; i<dstW; i++) {
......
ppc/yuv2rgb_altivec.c
View file @ 281ba1ce
...@@ -753,7 +753,7 @@ SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c) ...@@ -753,7 +753,7 @@ SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c)
void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], int brightness, int contrast, int saturation) void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], int brightness, int contrast, int saturation)
{ {
union { union {
DECLARE_ALIGNED(16, signed short, tmp[8]); DECLARE_ALIGNED(16, signed short, tmp)[8];
vector signed short vec; vector signed short vec;
} buf; } buf;
...@@ -791,7 +791,7 @@ ff_yuv2packedX_altivec(SwsContext *c, ...@@ -791,7 +791,7 @@ ff_yuv2packedX_altivec(SwsContext *c,
vector signed short RND = vec_splat_s16(1<<3); vector signed short RND = vec_splat_s16(1<<3);
vector unsigned short SCL = vec_splat_u16(4); vector unsigned short SCL = vec_splat_u16(4);
DECLARE_ALIGNED(16, unsigned long, scratch[16]); DECLARE_ALIGNED(16, unsigned long, scratch)[16];
vector signed short *YCoeffs, *CCoeffs; vector signed short *YCoeffs, *CCoeffs;
......
swscale.c
View file @ 281ba1ce
...@@ -251,11 +251,11 @@ DECLARE_ASM_CONST(8, uint64_t, bm00000111)=0x0000000000FFFFFFLL; ...@@ -251,11 +251,11 @@ DECLARE_ASM_CONST(8, uint64_t, bm00000111)=0x0000000000FFFFFFLL;
DECLARE_ASM_CONST(8, uint64_t, bm11111000)=0xFFFFFFFFFF000000LL; DECLARE_ASM_CONST(8, uint64_t, bm11111000)=0xFFFFFFFFFF000000LL;
DECLARE_ASM_CONST(8, uint64_t, bm01010101)=0x00FF00FF00FF00FFLL; DECLARE_ASM_CONST(8, uint64_t, bm01010101)=0x00FF00FF00FF00FFLL;
const DECLARE_ALIGNED(8, uint64_t, ff_dither4[2]) = { const DECLARE_ALIGNED(8, uint64_t, ff_dither4)[2] = {
0x0103010301030103LL, 0x0103010301030103LL,
0x0200020002000200LL,}; 0x0200020002000200LL,};
const DECLARE_ALIGNED(8, uint64_t, ff_dither8[2]) = { const DECLARE_ALIGNED(8, uint64_t, ff_dither8)[2] = {
0x0602060206020602LL, 0x0602060206020602LL,
0x0004000400040004LL,}; 0x0004000400040004LL,};
...@@ -289,7 +289,7 @@ DECLARE_ASM_CONST(8, uint64_t, ff_rgb24toY1Coeff) = 0x20DE0000408720DEULL; ...@@ -289,7 +289,7 @@ DECLARE_ASM_CONST(8, uint64_t, ff_rgb24toY1Coeff) = 0x20DE0000408720DEULL;
DECLARE_ASM_CONST(8, uint64_t, ff_rgb24toY2Coeff) = 0x0C88408700000C88ULL; DECLARE_ASM_CONST(8, uint64_t, ff_rgb24toY2Coeff) = 0x0C88408700000C88ULL;
DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toYOffset) = 0x0008400000084000ULL; DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toYOffset) = 0x0008400000084000ULL;
DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUV[2][4]) = { DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUV)[2][4] = {
{0x38380000DAC83838ULL, 0xECFFDAC80000ECFFULL, 0xF6E40000D0E3F6E4ULL, 0x3838D0E300003838ULL}, {0x38380000DAC83838ULL, 0xECFFDAC80000ECFFULL, 0xF6E40000D0E3F6E4ULL, 0x3838D0E300003838ULL},
{0xECFF0000DAC8ECFFULL, 0x3838DAC800003838ULL, 0x38380000D0E33838ULL, 0xF6E4D0E30000F6E4ULL}, {0xECFF0000DAC8ECFFULL, 0x3838DAC800003838ULL, 0x38380000D0E33838ULL, 0xF6E4D0E30000F6E4ULL},
}; };
...@@ -298,17 +298,17 @@ DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUVOffset)= 0x0040400000404000ULL; ...@@ -298,17 +298,17 @@ DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUVOffset)= 0x0040400000404000ULL;
#endif /* ARCH_X86 && CONFIG_GPL */ #endif /* ARCH_X86 && CONFIG_GPL */
DECLARE_ALIGNED(8, static const uint8_t, dither_2x2_4[2][8])={ DECLARE_ALIGNED(8, static const uint8_t, dither_2x2_4)[2][8]={
{ 1, 3, 1, 3, 1, 3, 1, 3, }, { 1, 3, 1, 3, 1, 3, 1, 3, },
{ 2, 0, 2, 0, 2, 0, 2, 0, }, { 2, 0, 2, 0, 2, 0, 2, 0, },
}; };
DECLARE_ALIGNED(8, static const uint8_t, dither_2x2_8[2][8])={ DECLARE_ALIGNED(8, static const uint8_t, dither_2x2_8)[2][8]={
{ 6, 2, 6, 2, 6, 2, 6, 2, }, { 6, 2, 6, 2, 6, 2, 6, 2, },
{ 0, 4, 0, 4, 0, 4, 0, 4, }, { 0, 4, 0, 4, 0, 4, 0, 4, },
}; };
DECLARE_ALIGNED(8, const uint8_t, dither_8x8_32[8][8])={ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_32)[8][8]={
{ 17, 9, 23, 15, 16, 8, 22, 14, }, { 17, 9, 23, 15, 16, 8, 22, 14, },
{ 5, 29, 3, 27, 4, 28, 2, 26, }, { 5, 29, 3, 27, 4, 28, 2, 26, },
{ 21, 13, 19, 11, 20, 12, 18, 10, }, { 21, 13, 19, 11, 20, 12, 18, 10, },
...@@ -319,7 +319,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_32[8][8])={ ...@@ -319,7 +319,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_32[8][8])={
{ 1, 25, 7, 31, 0, 24, 6, 30, }, { 1, 25, 7, 31, 0, 24, 6, 30, },
}; };
DECLARE_ALIGNED(8, const uint8_t, dither_8x8_73[8][8])={ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_73)[8][8]={
{ 0, 55, 14, 68, 3, 58, 17, 72, }, { 0, 55, 14, 68, 3, 58, 17, 72, },
{ 37, 18, 50, 32, 40, 22, 54, 35, }, { 37, 18, 50, 32, 40, 22, 54, 35, },
{ 9, 64, 5, 59, 13, 67, 8, 63, }, { 9, 64, 5, 59, 13, 67, 8, 63, },
...@@ -331,7 +331,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_73[8][8])={ ...@@ -331,7 +331,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_73[8][8])={
}; };
#if 1 #if 1
DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220)[8][8]={
{117, 62, 158, 103, 113, 58, 155, 100, }, {117, 62, 158, 103, 113, 58, 155, 100, },
{ 34, 199, 21, 186, 31, 196, 17, 182, }, { 34, 199, 21, 186, 31, 196, 17, 182, },
{144, 89, 131, 76, 141, 86, 127, 72, }, {144, 89, 131, 76, 141, 86, 127, 72, },
...@@ -343,7 +343,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={ ...@@ -343,7 +343,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={
}; };
#elif 1 #elif 1
// tries to correct a gamma of 1.5 // tries to correct a gamma of 1.5
DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220)[8][8]={
{ 0, 143, 18, 200, 2, 156, 25, 215, }, { 0, 143, 18, 200, 2, 156, 25, 215, },
{ 78, 28, 125, 64, 89, 36, 138, 74, }, { 78, 28, 125, 64, 89, 36, 138, 74, },
{ 10, 180, 3, 161, 16, 195, 8, 175, }, { 10, 180, 3, 161, 16, 195, 8, 175, },
...@@ -355,7 +355,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={ ...@@ -355,7 +355,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={
}; };
#elif 1 #elif 1
// tries to correct a gamma of 2.0 // tries to correct a gamma of 2.0
DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220)[8][8]={
{ 0, 124, 8, 193, 0, 140, 12, 213, }, { 0, 124, 8, 193, 0, 140, 12, 213, },
{ 55, 14, 104, 42, 66, 19, 119, 52, }, { 55, 14, 104, 42, 66, 19, 119, 52, },
{ 3, 168, 1, 145, 6, 187, 3, 162, }, { 3, 168, 1, 145, 6, 187, 3, 162, },
...@@ -367,7 +367,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={ ...@@ -367,7 +367,7 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={
}; };
#else #else
// tries to correct a gamma of 2.5 // tries to correct a gamma of 2.5
DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220)[8][8]={
{ 0, 107, 3, 187, 0, 125, 6, 212, }, { 0, 107, 3, 187, 0, 125, 6, 212, },
{ 39, 7, 86, 28, 49, 11, 102, 36, }, { 39, 7, 86, 28, 49, 11, 102, 36, },
{ 1, 158, 0, 131, 3, 180, 1, 151, }, { 1, 158, 0, 131, 3, 180, 1, 151, },
......
swscale_internal.h
View file @ 281ba1ce
...@@ -245,7 +245,7 @@ typedef struct SwsContext { ...@@ -245,7 +245,7 @@ typedef struct SwsContext {
#endif #endif
#if HAVE_VIS #if HAVE_VIS
DECLARE_ALIGNED(8, uint64_t, sparc_coeffs[10]); DECLARE_ALIGNED(8, uint64_t, sparc_coeffs)[10];
#endif #endif
/* function pointers for swScale() */ /* function pointers for swScale() */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment