RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support to BGR444/RGB444 foreign endian output in libswscale. 

Patch by Janusz Krzysztofik |jkrzyszt ^ tis icnet pl|.

Originally committed as revision 30855 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Janusz Krzysztofik 2010-03-06 11:27:31 +00:00 committed by Stefano Sabatini
parent 5988dc9eec
commit a4e441301d
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libswscale/swscale_internal.h
View File

@ -395,7 +395,8 @@ const char *sws_format_name(enum PixelFormat format);
|| (x)==PIX_FMT_RGB565LE \ || (x)==PIX_FMT_RGB565LE \
|| (x)==PIX_FMT_RGB555BE \ || (x)==PIX_FMT_RGB555BE \
|| (x)==PIX_FMT_RGB555LE \ || (x)==PIX_FMT_RGB555LE \
|| (x)==PIX_FMT_RGB444 \ || (x)==PIX_FMT_RGB444BE \
|| (x)==PIX_FMT_RGB444LE \
|| (x)==PIX_FMT_RGB8 \ || (x)==PIX_FMT_RGB8 \
|| (x)==PIX_FMT_RGB4 \ || (x)==PIX_FMT_RGB4 \
|| (x)==PIX_FMT_RGB4_BYTE \ || (x)==PIX_FMT_RGB4_BYTE \
@ -410,7 +411,8 @@ const char *sws_format_name(enum PixelFormat format);
|| (x)==PIX_FMT_BGR565LE \ || (x)==PIX_FMT_BGR565LE \
|| (x)==PIX_FMT_BGR555BE \ || (x)==PIX_FMT_BGR555BE \
|| (x)==PIX_FMT_BGR555LE \ || (x)==PIX_FMT_BGR555LE \
|| (x)==PIX_FMT_BGR444 \ || (x)==PIX_FMT_BGR444BE \
|| (x)==PIX_FMT_BGR444LE \
|| (x)==PIX_FMT_BGR8 \ || (x)==PIX_FMT_BGR8 \
|| (x)==PIX_FMT_BGR4 \ || (x)==PIX_FMT_BGR4 \
|| (x)==PIX_FMT_BGR4_BYTE \ || (x)==PIX_FMT_BGR4_BYTE \

10
libswscale/yuv2rgb.c
View File

@ -630,15 +630,18 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
|| c->dstFormat==PIX_FMT_RGB565LE || c->dstFormat==PIX_FMT_RGB565LE
|| c->dstFormat==PIX_FMT_RGB555BE || c->dstFormat==PIX_FMT_RGB555BE
|| c->dstFormat==PIX_FMT_RGB555LE || c->dstFormat==PIX_FMT_RGB555LE
|| c->dstFormat==PIX_FMT_RGB444 || c->dstFormat==PIX_FMT_RGB444BE
|| c->dstFormat==PIX_FMT_RGB444LE
|| c->dstFormat==PIX_FMT_RGB8 || c->dstFormat==PIX_FMT_RGB8
|| c->dstFormat==PIX_FMT_RGB4 || c->dstFormat==PIX_FMT_RGB4
|| c->dstFormat==PIX_FMT_RGB4_BYTE || c->dstFormat==PIX_FMT_RGB4_BYTE
|| c->dstFormat==PIX_FMT_MONOBLACK; || c->dstFormat==PIX_FMT_MONOBLACK;
const int isNotNe = c->dstFormat==PIX_FMT_NE(RGB565LE,RGB565BE) const int isNotNe = c->dstFormat==PIX_FMT_NE(RGB565LE,RGB565BE)
|| c->dstFormat==PIX_FMT_NE(RGB555LE,RGB555BE) || c->dstFormat==PIX_FMT_NE(RGB555LE,RGB555BE)
|| c->dstFormat==PIX_FMT_NE(RGB444LE,RGB444BE)
|| c->dstFormat==PIX_FMT_NE(BGR565LE,BGR565BE) || c->dstFormat==PIX_FMT_NE(BGR565LE,BGR565BE)
|| c->dstFormat==PIX_FMT_NE(BGR555LE,BGR555BE); || c->dstFormat==PIX_FMT_NE(BGR555LE,BGR555BE)
|| c->dstFormat==PIX_FMT_NE(BGR444LE,BGR444BE);
const int bpp = c->dstFormatBpp; const int bpp = c->dstFormatBpp;
uint8_t *y_table; uint8_t *y_table;
uint16_t *y_table16; uint16_t *y_table16;
@ -745,6 +748,9 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
y_table16[i+2048] = (yval >> 4) << bbase; y_table16[i+2048] = (yval >> 4) << bbase;
yb += cy; yb += cy;
} }
if (isNotNe)
for (i = 0; i < 1024*3; i++)
y_table16[i] = bswap_16(y_table16[i]);
fill_table(c->table_rV, 2, crv, y_table16 + yoffs); fill_table(c->table_rV, 2, crv, y_table16 + yoffs);
fill_table(c->table_gU, 2, cgu, y_table16 + yoffs + 1024); fill_table(c->table_gU, 2, cgu, y_table16 + yoffs + 1024);
fill_table(c->table_bU, 2, cbu, y_table16 + yoffs + 2048); fill_table(c->table_bU, 2, cbu, y_table16 + yoffs + 2048);