summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-15 01:27:34 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-15 01:27:34 +0000
commita381e71128b5809a5bbe9f3d072eb056915e8b8d (patch)
treec0846758bcf7ffd5d480d0b3d3e220df4c66f0d1 /libswscale
parent31be9659501961dbc616d821c803befe2bca156b (diff)
downloadmpv-a381e71128b5809a5bbe9f3d072eb056915e8b8d.tar.bz2
mpv-a381e71128b5809a5bbe9f3d072eb056915e8b8d.tar.xz
improve horizontal chroma resolution with pal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22994 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale.c5
-rw-r--r--libswscale/swscale_template.c8
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;
}
}