From 1407950a2f0fff343fb8b821edc09b40c2fc9b23 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 8 Aug 2009 15:18:48 +0000 Subject: Remove disabled crufty code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29482 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/rgb2rgb_template.c | 6 ------ libswscale/swscale.c | 26 -------------------------- libswscale/swscale_template.c | 10 ---------- 3 files changed, 42 deletions(-) diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index cd7fbae292..3d1fb8aea6 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -1258,10 +1258,6 @@ static inline void RENAME(rgb15to32)(const uint8_t *src, uint8_t *dst, long src_ #endif while (s < end) { -#if 0 //slightly slower on Athlon - int bgr= *s++; - *((uint32_t*)d)++ = ((bgr&0x1F)<<3) + ((bgr&0x3E0)<<6) + ((bgr&0x7C00)<<9); -#else register uint16_t bgr; bgr = *s++; #if HAVE_BIGENDIAN @@ -1274,8 +1270,6 @@ static inline void RENAME(rgb15to32)(const uint8_t *src, uint8_t *dst, long src_ *d++ = (bgr&0x3E0)>>2; *d++ = (bgr&0x7C00)>>7; *d++ = 255; -#endif - #endif } } diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 55871c5074..bd3cd2a72e 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -302,19 +302,6 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_32[8][8])={ { 1, 25, 7, 31, 0, 24, 6, 30, }, }; -#if 0 -DECLARE_ALIGNED(8, const uint8_t, dither_8x8_64[8][8])={ -{ 0, 48, 12, 60, 3, 51, 15, 63, }, -{ 32, 16, 44, 28, 35, 19, 47, 31, }, -{ 8, 56, 4, 52, 11, 59, 7, 55, }, -{ 40, 24, 36, 20, 43, 27, 39, 23, }, -{ 2, 50, 14, 62, 1, 49, 13, 61, }, -{ 34, 18, 46, 30, 33, 17, 45, 29, }, -{ 10, 58, 6, 54, 9, 57, 5, 53, }, -{ 42, 26, 38, 22, 41, 25, 37, 21, }, -}; -#endif - DECLARE_ALIGNED(8, const uint8_t, dither_8x8_73[8][8])={ { 0, 55, 14, 68, 3, 58, 17, 72, }, { 37, 18, 50, 32, 40, 22, 54, 35, }, @@ -326,19 +313,6 @@ DECLARE_ALIGNED(8, const uint8_t, dither_8x8_73[8][8])={ { 48, 30, 43, 25, 47, 29, 42, 24, }, }; -#if 0 -DECLARE_ALIGNED(8, const uint8_t, dither_8x8_128[8][8])={ -{ 68, 36, 92, 60, 66, 34, 90, 58, }, -{ 20, 116, 12, 108, 18, 114, 10, 106, }, -{ 84, 52, 76, 44, 82, 50, 74, 42, }, -{ 0, 96, 24, 120, 6, 102, 30, 126, }, -{ 64, 32, 88, 56, 70, 38, 94, 62, }, -{ 16, 112, 8, 104, 22, 118, 14, 110, }, -{ 80, 48, 72, 40, 86, 54, 78, 46, }, -{ 4, 100, 28, 124, 2, 98, 26, 122, }, -}; -#endif - #if 1 DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220[8][8])={ {117, 62, 158, 103, 113, 58, 155, 100, }, diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index e7c68469a8..e05fb0be67 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -2654,16 +2654,6 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s //printf("swscale %X %X %X -> %X %X %X\n", (int)src[0], (int)src[1], (int)src[2], // (int)dst[0], (int)dst[1], (int)dst[2]); -#if 0 //self test FIXME move to a vfilter or something - { - static volatile int i=0; - i++; - if (srcFormat==PIX_FMT_YUV420P && i==1 && srcSliceH>= c->srcH) - selfTest(src, srcStride, c->srcW, c->srcH); - i--; - } -#endif - //printf("sws Strides:%d %d %d -> %d %d %d\n", srcStride[0],srcStride[1],srcStride[2], //dstStride[0],dstStride[1],dstStride[2]); -- cgit v1.2.3