RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove const vector macro indirection that is useless and obfuscating 

now that the Metrowerks workarounds are gone.

Originally committed as revision 10633 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-10-01 14:23:36 +00:00
parent cd195f14c6
commit 7fd7259a3f
5 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
libavcodec/ppc/dsputil_altivec.c
View File

@ -55,7 +55,7 @@ int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h
{ {
int i; int i;
DECLARE_ALIGNED_16(int, s); DECLARE_ALIGNED_16(int, s);
const_vector unsigned char zero = (const_vector unsigned char)vec_splat_u8(0); const vector unsigned char zero = (const vector unsigned char)vec_splat_u8(0);
vector unsigned char *tv; vector unsigned char *tv;
vector unsigned char pix1v, pix2v, pix2iv, avgv, t5; vector unsigned char pix1v, pix2v, pix2iv, avgv, t5;
vector unsigned int sad; vector unsigned int sad;
@ -102,7 +102,7 @@ int sad16_y2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h
{ {
int i; int i;
DECLARE_ALIGNED_16(int, s); DECLARE_ALIGNED_16(int, s);
const_vector unsigned char zero = (const_vector unsigned char)vec_splat_u8(0); const vector unsigned char zero = (const vector unsigned char)vec_splat_u8(0);
vector unsigned char *tv; vector unsigned char *tv;
vector unsigned char pix1v, pix2v, pix3v, avgv, t5; vector unsigned char pix1v, pix2v, pix3v, avgv, t5;
vector unsigned int sad; vector unsigned int sad;
@ -163,8 +163,8 @@ int sad16_xy2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int
int i; int i;
DECLARE_ALIGNED_16(int, s); DECLARE_ALIGNED_16(int, s);
uint8_t *pix3 = pix2 + line_size; uint8_t *pix3 = pix2 + line_size;
const_vector unsigned char zero = (const_vector unsigned char)vec_splat_u8(0); const vector unsigned char zero = (const vector unsigned char)vec_splat_u8(0);
const_vector unsigned short two = (const_vector unsigned short)vec_splat_u16(2); const vector unsigned short two = (const vector unsigned short)vec_splat_u16(2);
vector unsigned char *tv, avgv, t5; vector unsigned char *tv, avgv, t5;
vector unsigned char pix1v, pix2v, pix3v, pix2iv, pix3iv; vector unsigned char pix1v, pix2v, pix3v, pix2iv, pix3iv;
vector unsigned short pix2lv, pix2hv, pix2ilv, pix2ihv; vector unsigned short pix2lv, pix2hv, pix2ilv, pix2ihv;
@ -263,7 +263,7 @@ int sad16_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
int i; int i;
DECLARE_ALIGNED_16(int, s); DECLARE_ALIGNED_16(int, s);
const_vector unsigned int zero = (const_vector unsigned int)vec_splat_u32(0); const vector unsigned int zero = (const vector unsigned int)vec_splat_u32(0);
vector unsigned char perm1, perm2, *pix1v, *pix2v; vector unsigned char perm1, perm2, *pix1v, *pix2v;
vector unsigned char t1, t2, t3,t4, t5; vector unsigned char t1, t2, t3,t4, t5;
vector unsigned int sad; vector unsigned int sad;
@ -305,7 +305,7 @@ int sad8_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
int i; int i;
DECLARE_ALIGNED_16(int, s); DECLARE_ALIGNED_16(int, s);
const_vector unsigned int zero = (const_vector unsigned int)vec_splat_u32(0); const vector unsigned int zero = (const vector unsigned int)vec_splat_u32(0);
vector unsigned char perm1, perm2, permclear, *pix1v, *pix2v; vector unsigned char perm1, perm2, permclear, *pix1v, *pix2v;
vector unsigned char t1, t2, t3,t4, t5; vector unsigned char t1, t2, t3,t4, t5;
vector unsigned int sad; vector unsigned int sad;
@ -350,7 +350,7 @@ int pix_norm1_altivec(uint8_t *pix, int line_size)
{ {
int i; int i;
DECLARE_ALIGNED_16(int, s); DECLARE_ALIGNED_16(int, s);
const_vector unsigned int zero = (const_vector unsigned int)vec_splat_u32(0); const vector unsigned int zero = (const vector unsigned int)vec_splat_u32(0);
vector unsigned char *tv; vector unsigned char *tv;
vector unsigned char pixv; vector unsigned char pixv;
vector unsigned int sv; vector unsigned int sv;
@ -386,7 +386,7 @@ int sse8_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
int i; int i;
DECLARE_ALIGNED_16(int, s); DECLARE_ALIGNED_16(int, s);
const_vector unsigned int zero = (const_vector unsigned int)vec_splat_u32(0); const vector unsigned int zero = (const vector unsigned int)vec_splat_u32(0);
vector unsigned char perm1, perm2, permclear, *pix1v, *pix2v; vector unsigned char perm1, perm2, permclear, *pix1v, *pix2v;
vector unsigned char t1, t2, t3,t4, t5; vector unsigned char t1, t2, t3,t4, t5;
vector unsigned int sum; vector unsigned int sum;
@ -442,7 +442,7 @@ int sse16_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
int i; int i;
DECLARE_ALIGNED_16(int, s); DECLARE_ALIGNED_16(int, s);
const_vector unsigned int zero = (const_vector unsigned int)vec_splat_u32(0); const vector unsigned int zero = (const vector unsigned int)vec_splat_u32(0);
vector unsigned char perm1, perm2, *pix1v, *pix2v; vector unsigned char perm1, perm2, *pix1v, *pix2v;
vector unsigned char t1, t2, t3,t4, t5; vector unsigned char t1, t2, t3,t4, t5;
vector unsigned int sum; vector unsigned int sum;
@ -486,7 +486,7 @@ int sse16_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
int pix_sum_altivec(uint8_t * pix, int line_size) int pix_sum_altivec(uint8_t * pix, int line_size)
{ {
const_vector unsigned int zero = (const_vector unsigned int)vec_splat_u32(0); const vector unsigned int zero = (const vector unsigned int)vec_splat_u32(0);
vector unsigned char perm, *pixv; vector unsigned char perm, *pixv;
vector unsigned char t1; vector unsigned char t1;
vector unsigned int sad; vector unsigned int sad;
@ -521,7 +521,7 @@ void get_pixels_altivec(DCTELEM *restrict block, const uint8_t *pixels, int line
{ {
int i; int i;
vector unsigned char perm, bytes, *pixv; vector unsigned char perm, bytes, *pixv;
const_vector unsigned char zero = (const_vector unsigned char)vec_splat_u8(0); const vector unsigned char zero = (const vector unsigned char)vec_splat_u8(0);
vector signed short shorts; vector signed short shorts;
for(i=0;i<8;i++) for(i=0;i<8;i++)
@ -548,7 +548,7 @@ void diff_pixels_altivec(DCTELEM *restrict block, const uint8_t *s1,
{ {
int i; int i;
vector unsigned char perm, bytes, *pixv; vector unsigned char perm, bytes, *pixv;
const_vector unsigned char zero = (const_vector unsigned char)vec_splat_u8(0); const vector unsigned char zero = (const vector unsigned char)vec_splat_u8(0);
vector signed short shorts1, shorts2; vector signed short shorts1, shorts2;
for(i=0;i<4;i++) for(i=0;i<4;i++)
@ -767,8 +767,8 @@ POWERPC_PERF_DECLARE(altivec_put_pixels8_xy2_num, 1);
blockv, temp1, temp2; blockv, temp1, temp2;
register vector unsigned short register vector unsigned short
pixelssum1, pixelssum2, temp3; pixelssum1, pixelssum2, temp3;
register const_vector unsigned char vczero = (const_vector unsigned char)vec_splat_u8(0); register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
register const_vector unsigned short vctwo = (const_vector unsigned short)vec_splat_u16(2); register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
temp1 = vec_ld(0, pixels); temp1 = vec_ld(0, pixels);
temp2 = vec_ld(16, pixels); temp2 = vec_ld(16, pixels);
@ -843,9 +843,9 @@ POWERPC_PERF_DECLARE(altivec_put_no_rnd_pixels8_xy2_num, 1);
blockv, temp1, temp2; blockv, temp1, temp2;
register vector unsigned short register vector unsigned short
pixelssum1, pixelssum2, temp3; pixelssum1, pixelssum2, temp3;
register const_vector unsigned char vczero = (const_vector unsigned char)vec_splat_u8(0); register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
register const_vector unsigned short vcone = (const_vector unsigned short)vec_splat_u16(1); register const vector unsigned short vcone = (const vector unsigned short)vec_splat_u16(1);
register const_vector unsigned short vctwo = (const_vector unsigned short)vec_splat_u16(2); register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
temp1 = vec_ld(0, pixels); temp1 = vec_ld(0, pixels);
temp2 = vec_ld(16, pixels); temp2 = vec_ld(16, pixels);
@ -920,8 +920,8 @@ POWERPC_PERF_DECLARE(altivec_put_pixels16_xy2_num, 1);
register vector unsigned short register vector unsigned short
pixelssum1, pixelssum2, temp3, pixelssum1, pixelssum2, temp3,
pixelssum3, pixelssum4, temp4; pixelssum3, pixelssum4, temp4;
register const_vector unsigned char vczero = (const_vector unsigned char)vec_splat_u8(0); register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
register const_vector unsigned short vctwo = (const_vector unsigned short)vec_splat_u16(2); register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
POWERPC_PERF_START_COUNT(altivec_put_pixels16_xy2_num, 1); POWERPC_PERF_START_COUNT(altivec_put_pixels16_xy2_num, 1);
@ -1002,9 +1002,9 @@ POWERPC_PERF_DECLARE(altivec_put_no_rnd_pixels16_xy2_num, 1);
register vector unsigned short register vector unsigned short
pixelssum1, pixelssum2, temp3, pixelssum1, pixelssum2, temp3,
pixelssum3, pixelssum4, temp4; pixelssum3, pixelssum4, temp4;
register const_vector unsigned char vczero = (const_vector unsigned char)vec_splat_u8(0); register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
register const_vector unsigned short vcone = (const_vector unsigned short)vec_splat_u16(1); register const vector unsigned short vcone = (const vector unsigned short)vec_splat_u16(1);
register const_vector unsigned short vctwo = (const_vector unsigned short)vec_splat_u16(2); register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
POWERPC_PERF_START_COUNT(altivec_put_no_rnd_pixels16_xy2_num, 1); POWERPC_PERF_START_COUNT(altivec_put_no_rnd_pixels16_xy2_num, 1);
@ -1076,25 +1076,25 @@ POWERPC_PERF_STOP_COUNT(altivec_put_no_rnd_pixels16_xy2_num, 1);
int hadamard8_diff8x8_altivec(/*MpegEncContext*/ void *s, uint8_t *dst, uint8_t *src, int stride, int h){ int hadamard8_diff8x8_altivec(/*MpegEncContext*/ void *s, uint8_t *dst, uint8_t *src, int stride, int h){
POWERPC_PERF_DECLARE(altivec_hadamard8_diff8x8_num, 1); POWERPC_PERF_DECLARE(altivec_hadamard8_diff8x8_num, 1);
int sum; int sum;
register const_vector unsigned char vzero = register const vector unsigned char vzero =
(const_vector unsigned char)vec_splat_u8(0); (const vector unsigned char)vec_splat_u8(0);
register vector signed short temp0, temp1, temp2, temp3, temp4, register vector signed short temp0, temp1, temp2, temp3, temp4,
temp5, temp6, temp7; temp5, temp6, temp7;
POWERPC_PERF_START_COUNT(altivec_hadamard8_diff8x8_num, 1); POWERPC_PERF_START_COUNT(altivec_hadamard8_diff8x8_num, 1);
{ {
register const_vector signed short vprod1 =(const_vector signed short) register const vector signed short vprod1 =(const vector signed short)
AVV( 1,-1, 1,-1, 1,-1, 1,-1); AVV( 1,-1, 1,-1, 1,-1, 1,-1);
register const_vector signed short vprod2 =(const_vector signed short) register const vector signed short vprod2 =(const vector signed short)
AVV( 1, 1,-1,-1, 1, 1,-1,-1); AVV( 1, 1,-1,-1, 1, 1,-1,-1);
register const_vector signed short vprod3 =(const_vector signed short) register const vector signed short vprod3 =(const vector signed short)
AVV( 1, 1, 1, 1,-1,-1,-1,-1); AVV( 1, 1, 1, 1,-1,-1,-1,-1);
register const_vector unsigned char perm1 = (const_vector unsigned char) register const vector unsigned char perm1 = (const vector unsigned char)
AVV(0x02, 0x03, 0x00, 0x01, 0x06, 0x07, 0x04, 0x05, AVV(0x02, 0x03, 0x00, 0x01, 0x06, 0x07, 0x04, 0x05,
0x0A, 0x0B, 0x08, 0x09, 0x0E, 0x0F, 0x0C, 0x0D); 0x0A, 0x0B, 0x08, 0x09, 0x0E, 0x0F, 0x0C, 0x0D);
register const_vector unsigned char perm2 = (const_vector unsigned char) register const vector unsigned char perm2 = (const vector unsigned char)
AVV(0x04, 0x05, 0x06, 0x07, 0x00, 0x01, 0x02, 0x03, AVV(0x04, 0x05, 0x06, 0x07, 0x00, 0x01, 0x02, 0x03,
0x0C, 0x0D, 0x0E, 0x0F, 0x08, 0x09, 0x0A, 0x0B); 0x0C, 0x0D, 0x0E, 0x0F, 0x08, 0x09, 0x0A, 0x0B);
register const_vector unsigned char perm3 = (const_vector unsigned char) register const vector unsigned char perm3 = (const vector unsigned char)
AVV(0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, AVV(0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07); 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07);
@ -1224,25 +1224,25 @@ static int hadamard8_diff16x8_altivec(/*MpegEncContext*/ void *s, uint8_t *dst,
temp5S REG_v(v13), temp5S REG_v(v13),
temp6S REG_v(v14), temp6S REG_v(v14),
temp7S REG_v(v15); temp7S REG_v(v15);
register const_vector unsigned char vzero REG_v(v31)= register const vector unsigned char vzero REG_v(v31)=
(const_vector unsigned char)vec_splat_u8(0); (const vector unsigned char)vec_splat_u8(0);
{ {
register const_vector signed short vprod1 REG_v(v16)= register const vector signed short vprod1 REG_v(v16)=
(const_vector signed short)AVV( 1,-1, 1,-1, 1,-1, 1,-1); (const vector signed short)AVV( 1,-1, 1,-1, 1,-1, 1,-1);
register const_vector signed short vprod2 REG_v(v17)= register const vector signed short vprod2 REG_v(v17)=
(const_vector signed short)AVV( 1, 1,-1,-1, 1, 1,-1,-1); (const vector signed short)AVV( 1, 1,-1,-1, 1, 1,-1,-1);
register const_vector signed short vprod3 REG_v(v18)= register const vector signed short vprod3 REG_v(v18)=
(const_vector signed short)AVV( 1, 1, 1, 1,-1,-1,-1,-1); (const vector signed short)AVV( 1, 1, 1, 1,-1,-1,-1,-1);
register const_vector unsigned char perm1 REG_v(v19)= register const vector unsigned char perm1 REG_v(v19)=
(const_vector unsigned char) (const vector unsigned char)
AVV(0x02, 0x03, 0x00, 0x01, 0x06, 0x07, 0x04, 0x05, AVV(0x02, 0x03, 0x00, 0x01, 0x06, 0x07, 0x04, 0x05,
0x0A, 0x0B, 0x08, 0x09, 0x0E, 0x0F, 0x0C, 0x0D); 0x0A, 0x0B, 0x08, 0x09, 0x0E, 0x0F, 0x0C, 0x0D);
register const_vector unsigned char perm2 REG_v(v20)= register const vector unsigned char perm2 REG_v(v20)=
(const_vector unsigned char) (const vector unsigned char)
AVV(0x04, 0x05, 0x06, 0x07, 0x00, 0x01, 0x02, 0x03, AVV(0x04, 0x05, 0x06, 0x07, 0x00, 0x01, 0x02, 0x03,
0x0C, 0x0D, 0x0E, 0x0F, 0x08, 0x09, 0x0A, 0x0B); 0x0C, 0x0D, 0x0E, 0x0F, 0x08, 0x09, 0x0A, 0x0B);
register const_vector unsigned char perm3 REG_v(v21)= register const vector unsigned char perm3 REG_v(v21)=
(const_vector unsigned char) (const vector unsigned char)
AVV(0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, AVV(0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07); 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07);
@ -1490,9 +1490,9 @@ POWERPC_PERF_DECLARE(altivec_avg_pixels8_xy2_num, 1);
register vector unsigned char blockv, temp1, temp2, blocktemp; register vector unsigned char blockv, temp1, temp2, blocktemp;
register vector unsigned short pixelssum1, pixelssum2, temp3; register vector unsigned short pixelssum1, pixelssum2, temp3;
register const_vector unsigned char vczero = (const_vector unsigned char) register const vector unsigned char vczero = (const vector unsigned char)
vec_splat_u8(0); vec_splat_u8(0);
register const_vector unsigned short vctwo = (const_vector unsigned short) register const vector unsigned short vctwo = (const vector unsigned short)
vec_splat_u16(2); vec_splat_u16(2);
temp1 = vec_ld(0, pixels); temp1 = vec_ld(0, pixels);

2
libavcodec/ppc/gcc_fixes.h
View File

@ -97,6 +97,4 @@ __ch (__bin_args_eq (vector unsigned int, (a1), vector unsigned int, (a2)), \
#endif #endif
#define const_vector const vector
#endif /* GCC_FIXES_H */ #endif /* GCC_FIXES_H */

4
libavcodec/ppc/gmc_altivec.c
View File

@ -45,8 +45,8 @@ POWERPC_PERF_DECLARE(altivec_gmc1_num, GMC1_PERF_COND);
( x16)*( y16), /* D */ ( x16)*( y16), /* D */
0, 0, 0, 0 /* padding */ 0, 0, 0, 0 /* padding */
}; };
register const_vector unsigned char vczero = (const_vector unsigned char)vec_splat_u8(0); register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
register const_vector unsigned short vcsr8 = (const_vector unsigned short)vec_splat_u16(8); register const vector unsigned short vcsr8 = (const vector unsigned short)vec_splat_u16(8);
register vector unsigned char dstv, dstv2, src_0, src_1, srcvA, srcvB, srcvC, srcvD; register vector unsigned char dstv, dstv2, src_0, src_1, srcvA, srcvB, srcvC, srcvD;
register vector unsigned short Av, Bv, Cv, Dv, rounderV, tempA, tempB, tempC, tempD; register vector unsigned short Av, Bv, Cv, Dv, rounderV, tempA, tempB, tempC, tempD;
int i; int i;

2
libavcodec/ppc/idct_altivec.c
View File

@ -45,7 +45,7 @@
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
#define vector_s16_t vector signed short #define vector_s16_t vector signed short
#define const_vector_s16_t const_vector signed short #define const_vector_s16_t const vector signed short
#define vector_u16_t vector unsigned short #define vector_u16_t vector unsigned short
#define vector_s8_t vector signed char #define vector_s8_t vector signed char
#define vector_u8_t vector unsigned char #define vector_u8_t vector unsigned char

4
libavcodec/ppc/mpegvideo_altivec.c
View File

@ -79,7 +79,7 @@ int dct_quantize_altivec(MpegEncContext* s,
int lastNonZero; int lastNonZero;
vector float row0, row1, row2, row3, row4, row5, row6, row7; vector float row0, row1, row2, row3, row4, row5, row6, row7;
vector float alt0, alt1, alt2, alt3, alt4, alt5, alt6, alt7; vector float alt0, alt1, alt2, alt3, alt4, alt5, alt6, alt7;
const_vector float zero = (const_vector float)FOUROF(0.); const vector float zero = (const vector float)FOUROF(0.);
// used after quantise step // used after quantise step
int oldBaseValue = 0; int oldBaseValue = 0;
@ -522,7 +522,7 @@ POWERPC_PERF_START_COUNT(altivec_dct_unquantize_h263_num, 1);
} }
{ {
register const_vector signed short vczero = (const_vector signed short)vec_splat_s16(0); register const vector signed short vczero = (const vector signed short)vec_splat_s16(0);
DECLARE_ALIGNED_16(short, qmul8[]) = DECLARE_ALIGNED_16(short, qmul8[]) =
{ {
qmul, qmul, qmul, qmul, qmul, qmul, qmul, qmul,