diff options
| author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-04 16:40:35 +0000 |
|---|---|---|
| committer | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-04 16:40:35 +0000 |
| commit | 15d516ffdf8e0f4dde6f15b9f03767fb17636a03 (patch) | |
| tree | eca34afaec7ca580700dfeb66470f92a29226f14 /libswscale/swscale_template.c | |
| parent | cb8c70d6c2ee1a9aa6465719854175f4ede514fd (diff) | |
| download | mpv-15d516ffdf8e0f4dde6f15b9f03767fb17636a03.tar.bz2 mpv-15d516ffdf8e0f4dde6f15b9f03767fb17636a03.tar.xz | |
Remove g6Dither from libswscale.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27715 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale/swscale_template.c')
| -rw-r--r-- | libswscale/swscale_template.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index 74f4c57285..e960c7dad3 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -1105,7 +1105,7 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_ /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm2\n\t" - "paddusb "MANGLE(g6Dither)", %%mm4\n\t" + "paddusb "MANGLE(g5Dither)", %%mm4\n\t" "paddusb "MANGLE(r5Dither)", %%mm5\n\t" #endif @@ -1165,7 +1165,7 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_ /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm2 \n\t" - "paddusb "MANGLE(g6Dither)", %%mm4 \n\t" + "paddusb "MANGLE(g5Dither)", %%mm4 \n\t" "paddusb "MANGLE(r5Dither)", %%mm5 \n\t" #endif @@ -1330,7 +1330,7 @@ FULL_YSCALEYUV2RGB FULL_YSCALEYUV2RGB #ifdef DITHER1XBPP - "paddusb "MANGLE(g6Dither)", %%mm1 \n\t" + "paddusb "MANGLE(g5Dither)", %%mm1 \n\t" "paddusb "MANGLE(r5Dither)", %%mm0 \n\t" "paddusb "MANGLE(b5Dither)", %%mm3 \n\t" #endif @@ -1490,7 +1490,7 @@ FULL_YSCALEYUV2RGB /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm2 \n\t" - "paddusb "MANGLE(g6Dither)", %%mm4 \n\t" + "paddusb "MANGLE(g5Dither)", %%mm4 \n\t" "paddusb "MANGLE(r5Dither)", %%mm5 \n\t" #endif @@ -1602,7 +1602,7 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t * /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm2 \n\t" - "paddusb "MANGLE(g6Dither)", %%mm4 \n\t" + "paddusb "MANGLE(g5Dither)", %%mm4 \n\t" "paddusb "MANGLE(r5Dither)", %%mm5 \n\t" #endif @@ -1691,7 +1691,7 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t * /* mm2=B, %%mm4=G, %%mm5=R, %%mm7=0 */ #ifdef DITHER1XBPP "paddusb "MANGLE(b5Dither)", %%mm2 \n\t" - "paddusb "MANGLE(g6Dither)", %%mm4 \n\t" + "paddusb "MANGLE(g5Dither)", %%mm4 \n\t" "paddusb "MANGLE(r5Dither)", %%mm5 \n\t" #endif @@ -3092,8 +3092,10 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s #ifdef HAVE_MMX b5Dither= ff_dither8[dstY&1]; - g6Dither= ff_dither4[dstY&1]; - g5Dither= ff_dither8[dstY&1]; + if (c->dstFormat == PIX_FMT_RGB555 || c->dstFormat == PIX_FMT_BGR555) + g5Dither= ff_dither8[dstY&1]; + else + g5Dither= ff_dither4[dstY&1]; r5Dither= ff_dither8[(dstY+1)&1]; #endif if (dstY < dstH-2) |