RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

bgr16 input support 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4579 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael 2002-02-08 00:42:00 +00:00
parent b7685640c9
commit cfed813582
2 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
postproc/swscale.c
View File

@ -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) supported output formats: YV12, I420, IYUV, BGR15, BGR16, BGR24, BGR32 (grayscale soon too)
BGR15/16 support dithering BGR15/16 support dithering
@ -87,7 +87,7 @@ untested special converters
#define isPacked(x) ((x)==IMGFMT_YUY2 || ((x)&IMGFMT_BGR_MASK)==IMGFMT_BGR || ((x)&IMGFMT_RGB_MASK)==IMGFMT_RGB) #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 isGray(x) ((x)==IMGFMT_Y800)
#define isSupportedIn(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 || (x)==IMGFMT_YUY2 \ #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_RGB32|| (x)==IMGFMT_RGB24\
|| (x)==IMGFMT_Y800) || (x)==IMGFMT_Y800)
#define isSupportedOut(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 \ #define isSupportedOut(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 \

60
postproc/swscale_template.c
View File

@ -1666,6 +1666,55 @@ static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
#endif #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) static inline void RENAME(rgb32ToY)(uint8_t *dst, uint8_t *src, int width)
{ {
int i; int i;
@ -1903,6 +1952,11 @@ static inline void RENAME(hyscale)(uint16_t *dst, int dstWidth, uint8_t *src, in
RENAME(bgr24ToY)(formatConvBuffer, src, srcW); RENAME(bgr24ToY)(formatConvBuffer, src, srcW);
src= formatConvBuffer; src= formatConvBuffer;
} }
else if(srcFormat==IMGFMT_BGR16)
{
RENAME(bgr16ToY)(formatConvBuffer, src, srcW);
src= formatConvBuffer;
}
else if(srcFormat==IMGFMT_RGB32) else if(srcFormat==IMGFMT_RGB32)
{ {
RENAME(rgb32ToY)(formatConvBuffer, src, srcW); RENAME(rgb32ToY)(formatConvBuffer, src, srcW);
@ -2060,6 +2114,12 @@ inline static void RENAME(hcscale)(uint16_t *dst, int dstWidth, uint8_t *src1, u
src1= formatConvBuffer; src1= formatConvBuffer;
src2= formatConvBuffer+2048; src2= formatConvBuffer+2048;
} }
else if(srcFormat==IMGFMT_BGR16)
{
RENAME(bgr16ToUV)(formatConvBuffer, formatConvBuffer+2048, src1, src2, srcW);
src1= formatConvBuffer;
src2= formatConvBuffer+2048;
}
else if(srcFormat==IMGFMT_RGB32) else if(srcFormat==IMGFMT_RGB32)
{ {
RENAME(rgb32ToUV)(formatConvBuffer, formatConvBuffer+2048, src1, src2, srcW); RENAME(rgb32ToUV)(formatConvBuffer, formatConvBuffer+2048, src1, src2, srcW);