generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

YUV into RGB48 BE/LE conversion support

Browse Source 
Originally committed as revision 29342 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Kostya Shishkov
2009-06-02 12:30:11 +00:00
parent e8417235d0
commit 68e7f4828d
2 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libswscale/swscale.c
View File

@@ -853,6 +853,24 @@ static inline void yuv2nv12XinC(const int16_t *lumFilter, const int16_t **lumSrc
#define YSCALE_YUV_2_ANYRGB_C(func, func2, func_g16, func_monoblack)\ #define YSCALE_YUV_2_ANYRGB_C(func, func2, func_g16, func_monoblack)\
switch(c->dstFormat)\ switch(c->dstFormat)\
{\ {\
case PIX_FMT_RGB48BE:\
case PIX_FMT_RGB48LE:\
func(uint8_t,0)\
((uint8_t*)dest)[ 0]= r[Y1];\
((uint8_t*)dest)[ 1]= r[Y1];\
((uint8_t*)dest)[ 2]= g[Y1];\
((uint8_t*)dest)[ 3]= g[Y1];\
((uint8_t*)dest)[ 4]= b[Y1];\
((uint8_t*)dest)[ 5]= b[Y1];\
((uint8_t*)dest)[ 6]= r[Y2];\
((uint8_t*)dest)[ 7]= r[Y2];\
((uint8_t*)dest)[ 8]= g[Y2];\
((uint8_t*)dest)[ 9]= g[Y2];\
((uint8_t*)dest)[10]= b[Y2];\
((uint8_t*)dest)[11]= b[Y2];\
dest+=12;\
}\
break;\
case PIX_FMT_RGBA:\ case PIX_FMT_RGBA:\
case PIX_FMT_BGRA:\ case PIX_FMT_BGRA:\
if (CONFIG_SMALL){\ if (CONFIG_SMALL){\

39
libswscale/yuv2rgb.c
View File

@@ -80,6 +80,16 @@ const int32_t ff_yuv2rgb_coeffs[8][4] = {
Y = ysrc[2*i+1-o]; \ Y = ysrc[2*i+1-o]; \
dst[2*i+1] = r[Y] + g[Y] + b[Y] + (asrc[2*i+1]<<s); dst[2*i+1] = r[Y] + g[Y] + b[Y] + (asrc[2*i+1]<<s);
#define PUTRGB48(dst,src,i) \
Y = src[2*i]; \
dst[12*i+ 0] = dst[12*i+ 1] = r[Y]; \
dst[12*i+ 2] = dst[12*i+ 3] = g[Y]; \
dst[12*i+ 4] = dst[12*i+ 5] = b[Y]; \
Y = src[2*i+1]; \
dst[12*i+ 6] = dst[12*i+ 7] = r[Y]; \
dst[12*i+ 8] = dst[12*i+ 9] = g[Y]; \
dst[12*i+10] = dst[12*i+11] = b[Y];
#define YUV2RGBFUNC(func_name, dst_type, alpha) \ #define YUV2RGBFUNC(func_name, dst_type, alpha) \
static int func_name(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, \ static int func_name(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, \
int srcSliceH, uint8_t* dst[], int dstStride[]){\ int srcSliceH, uint8_t* dst[], int dstStride[]){\
@@ -129,6 +139,32 @@ static int func_name(SwsContext *c, uint8_t* src[], int srcStride[], int srcSlic
ENDYUV2RGBLINE(dst_delta)\ ENDYUV2RGBLINE(dst_delta)\
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuv2rgb_c_48, uint8_t, 0)
LOADCHROMA(0);
PUTRGB48(dst_1,py_1,0);
PUTRGB48(dst_2,py_2,0);
LOADCHROMA(1);
PUTRGB48(dst_2,py_2,1);
PUTRGB48(dst_1,py_1,1);
LOADCHROMA(2);
PUTRGB48(dst_1,py_1,2);
PUTRGB48(dst_2,py_2,2);
LOADCHROMA(3);
PUTRGB48(dst_2,py_2,3);
PUTRGB48(dst_1,py_1,3);
ENDYUV2RGBLINE(48)
LOADCHROMA(0);
PUTRGB48(dst_1,py_1,0);
PUTRGB48(dst_2,py_2,0);
LOADCHROMA(1);
PUTRGB48(dst_2,py_2,1);
PUTRGB48(dst_1,py_1,1);
ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuv2rgb_c_32, uint32_t, 0) YUV2RGBFUNC(yuv2rgb_c_32, uint32_t, 0)
LOADCHROMA(0); LOADCHROMA(0);
PUTRGB(dst_1,py_1,0,0); PUTRGB(dst_1,py_1,0,0);
@@ -491,6 +527,8 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
av_log(c, AV_LOG_WARNING, "No accelerated colorspace conversion found.\n"); av_log(c, AV_LOG_WARNING, "No accelerated colorspace conversion found.\n");
switch (c->dstFormat) { switch (c->dstFormat) {
case PIX_FMT_RGB48BE:
case PIX_FMT_RGB48LE: return yuv2rgb_c_48;
case PIX_FMT_ARGB: case PIX_FMT_ARGB:
case PIX_FMT_ABGR: if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) return yuva2argb_c; case PIX_FMT_ABGR: if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) return yuva2argb_c;
case PIX_FMT_RGBA: case PIX_FMT_RGBA:
@@ -664,6 +702,7 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
fill_gv_table(c->table_gV, 2, cgv); fill_gv_table(c->table_gV, 2, cgv);
break; break;
case 24: case 24:
case 48:
c->yuvTable = av_malloc(1024); c->yuvTable = av_malloc(1024);
y_table = c->yuvTable; y_table = c->yuvTable;
yb = -(384<<16) - oy; yb = -(384<<16) - oy;