diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-04-15 01:27:34 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-04-15 01:27:34 +0000 |
| commit | fa65e2f63ac4ac7d2a2030191df0842a31bc5501 (patch) | |
| tree | 207c79426955be2f4978f7ef2828dd1fcb01ae3e | |
| parent | 21c08a3f1c91c6a9fa7dbaf48d14078ecb4b985d (diff) | |
| download | ffmpeg-fa65e2f63ac4ac7d2a2030191df0842a31bc5501.tar.gz | |
improve horizontal chroma resolution with pal
Originally committed as revision 22994 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/swscale.c | 5 | ||||
| -rw-r--r-- | libswscale/swscale_template.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 1b21a2f463..0dec5e5e8e 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2036,7 +2036,10 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH c->chrSrcVSubSample+= c->vChrDrop; // drop every 2. pixel for chroma calculation unless user wants full chroma - if((isBGR(srcFormat) || isRGB(srcFormat)) && !(flags&SWS_FULL_CHR_H_INP)) + if((isBGR(srcFormat) || isRGB(srcFormat)) && !(flags&SWS_FULL_CHR_H_INP) + && srcFormat!=PIX_FMT_RGB8 && srcFormat!=PIX_FMT_BGR8 + && srcFormat!=PIX_FMT_RGB4 && srcFormat!=PIX_FMT_BGR4 + && srcFormat!=PIX_FMT_RGB4_BYTE && srcFormat!=PIX_FMT_BGR4_BYTE) c->chrSrcHSubSample=1; if(param){ diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index a8616efcb0..61f8705a4c 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -2296,12 +2296,10 @@ static inline void RENAME(palToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, assert(src1 == src2); for(i=0; i<width; i++) { - int d0= src1[2*i ]; - int d1= src1[2*i+1]; - int p = (pal[d0]&0xFF00FF) + (pal[d1]&0xFF00FF); + int p= pal[src1[i]]; - dstU[i]= (pal[d0]+pal[d1]-p)>>9; - dstV[i]= p>>17; + dstU[i]= p>>8; + dstV[i]= p>>16; } } |