diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-24 20:05:53 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-24 20:05:53 +0000 |
| commit | f78969448f0c4995b37f173f28e5de6231486748 (patch) | |
| tree | 3d6fd2a326ee4ab751dccf787effcac065acc251 /postproc | |
| parent | d402d04e4af39bbc77f2aff3b21fa3060f815753 (diff) | |
| download | mpv-f78969448f0c4995b37f173f28e5de6231486748.tar.bz2 mpv-f78969448f0c4995b37f173f28e5de6231486748.tar.xz | |
killing globals
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6555 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'postproc')
| -rw-r--r-- | postproc/swscale.c | 6 | ||||
| -rw-r--r-- | postproc/swscale_template.c | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/postproc/swscale.c b/postproc/swscale.c index 5cb3a80785..d6e4fc236f 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -203,10 +203,6 @@ static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00003831D0E6F6 static const uint64_t bgr2YOffset __attribute__((aligned(8))) = 0x1010101010101010ULL; static const uint64_t bgr2UVOffset __attribute__((aligned(8)))= 0x8080808080808080ULL; static const uint64_t w1111 __attribute__((aligned(8))) = 0x0001000100010001ULL; - -// FIXME remove -static uint64_t __attribute__((aligned(8))) asm_yalpha1; -static uint64_t __attribute__((aligned(8))) asm_uvalpha1; #endif // clipping helper table for C implementations: @@ -260,7 +256,7 @@ static inline void orderYUV(int format, uint8_t * sortedP[], int sortedStride[], void in_asm_used_var_warning_killer() { volatile int i= yCoeff+vrCoeff+ubCoeff+vgCoeff+ugCoeff+bF8+bFC+w400+w80+w10+ - bm00001111+bm00000111+bm11111000+b16Mask+g16Mask+r16Mask+b15Mask+g15Mask+r15Mask+asm_yalpha1+ asm_uvalpha1+ + bm00001111+bm00000111+bm11111000+b16Mask+g16Mask+r16Mask+b15Mask+g15Mask+r15Mask+ M24A+M24B+M24C+w02 + b5Dither+g5Dither+r5Dither+g6Dither+dither4[0]+dither8[0]+bm01010101; if(i) i=0; } diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c index 6e14881cc5..85e18a8dbd 100644 --- a/postproc/swscale_template.c +++ b/postproc/swscale_template.c @@ -59,7 +59,6 @@ #define MOVNTQ(a,b) "movq " #a ", " #b " \n\t" #endif - #define YSCALEYUV2YV12X(x) \ "xorl %%eax, %%eax \n\t"\ "pxor %%mm3, %%mm3 \n\t"\ @@ -239,11 +238,11 @@ "movd %6, %%mm6 \n\t" /*yalpha1*/\ "punpcklwd %%mm6, %%mm6 \n\t"\ "punpcklwd %%mm6, %%mm6 \n\t"\ - "movq %%mm6, "MANGLE(asm_yalpha1)"\n\t"\ + "movq %%mm6, 3968(%2) \n\t"\ "movd %7, %%mm5 \n\t" /*uvalpha1*/\ "punpcklwd %%mm5, %%mm5 \n\t"\ "punpcklwd %%mm5, %%mm5 \n\t"\ - "movq %%mm5, "MANGLE(asm_uvalpha1)"\n\t"\ + "movq %%mm5, 3976(%2) \n\t"\ "xorl %%eax, %%eax \n\t"\ ".balign 16 \n\t"\ "1: \n\t"\ @@ -253,7 +252,7 @@ "movq 4096(%3, %%eax), %%mm4 \n\t" /* uvbuf1[eax+2048]*/\ "psubw %%mm3, %%mm2 \n\t" /* uvbuf0[eax] - uvbuf1[eax]*/\ "psubw %%mm4, %%mm5 \n\t" /* uvbuf0[eax+2048] - uvbuf1[eax+2048]*/\ - "movq "MANGLE(asm_uvalpha1)", %%mm0\n\t"\ + "movq 3976(%2), %%mm0 \n\t"\ "pmulhw %%mm0, %%mm2 \n\t" /* (uvbuf0[eax] - uvbuf1[eax])uvalpha1>>16*/\ "pmulhw %%mm0, %%mm5 \n\t" /* (uvbuf0[eax+2048] - uvbuf1[eax+2048])uvalpha1>>16*/\ "psraw $4, %%mm3 \n\t" /* uvbuf0[eax] - uvbuf1[eax] >>4*/\ @@ -273,8 +272,8 @@ "movq 8(%1, %%eax, 2), %%mm7 \n\t" /*buf1[eax]*/\ "psubw %%mm1, %%mm0 \n\t" /* buf0[eax] - buf1[eax]*/\ "psubw %%mm7, %%mm6 \n\t" /* buf0[eax] - buf1[eax]*/\ - "pmulhw "MANGLE(asm_yalpha1)", %%mm0\n\t" /* (buf0[eax] - buf1[eax])yalpha1>>16*/\ - "pmulhw "MANGLE(asm_yalpha1)", %%mm6\n\t" /* (buf0[eax] - buf1[eax])yalpha1>>16*/\ + "pmulhw 3968(%2), %%mm0 \n\t" /* (buf0[eax] - buf1[eax])yalpha1>>16*/\ + "pmulhw 3968(%2), %%mm6 \n\t" /* (buf0[eax] - buf1[eax])yalpha1>>16*/\ "psraw $4, %%mm1 \n\t" /* buf0[eax] - buf1[eax] >>4*/\ "psraw $4, %%mm7 \n\t" /* buf0[eax] - buf1[eax] >>4*/\ "paddw %%mm0, %%mm1 \n\t" /* buf0[eax]yalpha1 + buf1[eax](1-yalpha1) >>16*/\ |