summaryrefslogtreecommitdiffstats
path: root/libswscale/swscale.c
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-15 00:53:32 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-15 00:53:32 +0000
commit31be9659501961dbc616d821c803befe2bca156b (patch)
tree66aa3a6f7a98be52dc7cfc6a004eec90d321c1b2 /libswscale/swscale.c
parent4d63a7827781e9d3c195698cbabb90a60879c2bd (diff)
downloadmpv-31be9659501961dbc616d821c803befe2bca156b.tar.bz2
mpv-31be9659501961dbc616d821c803befe2bca156b.tar.xz
convert palette to yuv instead of converting each pixel after pal->rgb
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22993 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale/swscale.c')
-rw-r--r--libswscale/swscale.c27
1 files changed, 22 insertions, 5 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index a56cdefa3f..1b21a2f463 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2438,6 +2438,9 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH
*/
int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]){
+ int i;
+ uint8_t* src2[4]= {src[0], src[1], src[2]};
+ uint32_t pal[256];
if (c->sliceDir == 0 && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
av_log(c, AV_LOG_ERROR, "swScaler: slices start in the middle!\n");
return 0;
@@ -2446,24 +2449,38 @@ int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
if (srcSliceY == 0) c->sliceDir = 1; else c->sliceDir = -1;
}
+ if(c->srcFormat == PIX_FMT_PAL8){
+ for(i=0; i<256; i++){
+ int p= ((uint32_t*)(src[1]))[i];
+ int r= (p>>16)&0xFF;
+ int g= (p>> 8)&0xFF;
+ int b= p &0xFF;
+ int y= av_clip_uint8(((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16 );
+ int u= av_clip_uint8(((RU*r + GU*g + BU*b)>>RGB2YUV_SHIFT) + 128);
+ int v= av_clip_uint8(((RV*r + GV*g + BV*b)>>RGB2YUV_SHIFT) + 128);
+ pal[i]= y + (u<<8) + (v<<16);
+ }
+ src2[1]= pal;
+ }
+
// copy strides, so they can safely be modified
if (c->sliceDir == 1) {
- uint8_t* src2[4]= {src[0], src[1], src[2]};
// slices go from top to bottom
int srcStride2[4]= {srcStride[0], srcStride[1], srcStride[2]};
int dstStride2[4]= {dstStride[0], dstStride[1], dstStride[2]};
return c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst, dstStride2);
} else {
// slices go from bottom to top => we flip the image internally
- uint8_t* src2[4]= {src[0] + (srcSliceH-1)*srcStride[0],
- src[1] + ((srcSliceH>>c->chrSrcVSubSample)-1)*srcStride[1],
- src[2] + ((srcSliceH>>c->chrSrcVSubSample)-1)*srcStride[2]
- };
uint8_t* dst2[4]= {dst[0] + (c->dstH-1)*dstStride[0],
dst[1] + ((c->dstH>>c->chrDstVSubSample)-1)*dstStride[1],
dst[2] + ((c->dstH>>c->chrDstVSubSample)-1)*dstStride[2]};
int srcStride2[4]= {-srcStride[0], -srcStride[1], -srcStride[2]};
int dstStride2[4]= {-dstStride[0], -dstStride[1], -dstStride[2]};
+
+ src2[0] += (srcSliceH-1)*srcStride[0];
+ if(c->srcFormat != PIX_FMT_PAL8)
+ src2[1] += ((srcSliceH>>c->chrSrcVSubSample)-1)*srcStride[1];
+ src2[2] += ((srcSliceH>>c->chrSrcVSubSample)-1)*srcStride[2];
return c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, srcSliceH, dst2, dstStride2);
}