Update of /cvsroot/mplayer/main/postproc In directory mplayer:/var/tmp.root/cvs-serv28175 Modified Files: swscale.c swscale_template.c Log Message: bgr16 input support Index: swscale.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- swscale.c 7 Feb 2002 15:29:15 -0000 1.73 +++ swscale.c 8 Feb 2002 00:42:00 -0000 1.74 @@ -17,7 +17,7 @@ */ /* - supported Input formats: YV12, I420, IYUV, YUY2, BGR32, BGR24, RGB32, RGB24, Y8, Y800 + supported Input formats: YV12, I420, IYUV, YUY2, BGR32, BGR24, BGR16, RGB32, RGB24, Y8, Y800 supported output formats: YV12, I420, IYUV, BGR15, BGR16, BGR24, BGR32 (grayscale soon too) BGR15/16 support dithering @@ -87,7 +87,7 @@ #define isPacked(x) ((x)==IMGFMT_YUY2 || ((x)&IMGFMT_BGR_MASK)==IMGFMT_BGR || ((x)&IMGFMT_RGB_MASK)==IMGFMT_RGB) #define isGray(x) ((x)==IMGFMT_Y800) #define isSupportedIn(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 || (x)==IMGFMT_YUY2 \ - || (x)==IMGFMT_BGR32|| (x)==IMGFMT_BGR24\ + || (x)==IMGFMT_BGR32|| (x)==IMGFMT_BGR24|| (x)==IMGFMT_BGR16\ || (x)==IMGFMT_RGB32|| (x)==IMGFMT_RGB24\ || (x)==IMGFMT_Y800) #define isSupportedOut(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 \ Index: swscale_template.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/swscale_template.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- swscale_template.c 6 Feb 2002 22:55:57 -0000 1.66 +++ swscale_template.c 8 Feb 2002 00:42:00 -0000 1.67 @@ -1666,6 +1666,55 @@ #endif } +static inline void RENAME(bgr16ToY)(uint8_t *dst, uint8_t *src, int width) +{ + int i; + for(i=0; i<width; i++) + { + int d= src[i*2] + (src[i*2+1]<<8); + int b= d&0x1F; + int g= (d>>5)&0x3F; + int r= (d>>11)&0x1F; + + dst[i]= ((2*RY*r + GY*g + 2*BY*b)>>(RGB2YUV_SHIFT-2)) + 16; + } +} + +static inline void RENAME(bgr16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) +{ + int i; + for(i=0; i<width; i++) + { +//FIXME optimize + int d0= src1[i*4] + (src1[i*4+1]<<8); + int b0= d0&0x1F; + int g0= (d0>>5)&0x3F; + int r0= (d0>>11)&0x1F; + + int d1= src1[i*4+2] + (src1[i*4+3]<<8); + int b1= d1&0x1F; + int g1= (d1>>5)&0x3F; + int r1= (d1>>11)&0x1F; + + int d2= src2[i*4] + (src2[i*4+1]<<8); + int b2= d2&0x1F; + int g2= (d2>>5)&0x3F; + int r2= (d2>>11)&0x1F; + + int d3= src2[i*4+2] + (src2[i*4+3]<<8); + int b3= d3&0x1F; + int g3= (d3>>5)&0x3F; + int r3= (d3>>11)&0x1F; + + int b= b0 + b1 + b2 + b3; + int g= g0 + g1 + g2 + g3; + int r= r0 + r1 + r2 + r3; + + dstU[i]= ((2*RU*r + GU*g + 2*BU*b)>>(RGB2YUV_SHIFT+2-2)) + 128; + dstV[i]= ((2*RV*r + GV*g + 2*BV*b)>>(RGB2YUV_SHIFT+2-2)) + 128; + } +} + static inline void RENAME(rgb32ToY)(uint8_t *dst, uint8_t *src, int width) { int i; @@ -1903,6 +1952,11 @@ RENAME(bgr24ToY)(formatConvBuffer, src, srcW); src= formatConvBuffer; } + else if(srcFormat==IMGFMT_BGR16) + { + RENAME(bgr16ToY)(formatConvBuffer, src, srcW); + src= formatConvBuffer; + } else if(srcFormat==IMGFMT_RGB32) { RENAME(rgb32ToY)(formatConvBuffer, src, srcW); @@ -2057,6 +2111,12 @@ else if(srcFormat==IMGFMT_BGR24) { RENAME(bgr24ToUV)(formatConvBuffer, formatConvBuffer+2048, src1, src2, srcW); + src1= formatConvBuffer; + src2= formatConvBuffer+2048; + } + else if(srcFormat==IMGFMT_BGR16) + { + RENAME(bgr16ToUV)(formatConvBuffer, formatConvBuffer+2048, src1, src2, srcW); src1= formatConvBuffer; src2= formatConvBuffer+2048; }