From 615d3ead235409f6824606c1a7523738c328e2c4 Mon Sep 17 00:00:00 2001 From: kostya Date: Tue, 2 Jun 2009 12:30:11 +0000 Subject: YUV into RGB48 BE/LE conversion support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29342 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 18 ++++++++++++++++++ libswscale/yuv2rgb.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 921eb2db3a..b87698645e 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -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)\ 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_BGRA:\ if (CONFIG_SMALL){\ diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index d2389c71dd..753bd486fc 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -80,6 +80,16 @@ const int32_t ff_yuv2rgb_coeffs[8][4] = { Y = ysrc[2*i+1-o]; \ dst[2*i+1] = r[Y] + g[Y] + b[Y] + (asrc[2*i+1]<dstFormat) { + case PIX_FMT_RGB48BE: + case PIX_FMT_RGB48LE: return yuv2rgb_c_48; case PIX_FMT_ARGB: case PIX_FMT_ABGR: if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) return yuva2argb_c; 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); break; case 24: + case 48: c->yuvTable = av_malloc(1024); y_table = c->yuvTable; yb = -(384<<16) - oy; -- cgit v1.2.3