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

vo_x11: use imgfmt metadata instead of hardcoded format table 

Useless, but super generic! Actually may add support for other fringe
formats, however vo_x11 in itself is useless, so nothing won here. Also
I didn't bother with big endian support.
This commit is contained in:
wm4 2020-05-20 00:14:09 +02:00
parent 176f422213
commit 20403abcfa
1 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
video/out/vo_x11.c
View File

@ -159,28 +159,7 @@ static void freeMyXImage(struct priv *p, int foo)
p->myximage[foo] = NULL; p->myximage[foo] = NULL;
} }
#define BM(first, count) (((1 << (count)) - 1) << (first)) #define MAKE_MASK(comp) (((1u << (comp).size) - 1) << (comp).offset)
const struct fmt_entry {
uint32_t mpfmt;
int depth;
int byte_order;
unsigned red_mask;
unsigned green_mask;
unsigned blue_mask;
} mp_to_x_fmt[] = {
{IMGFMT_0RGB, 32, MSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF},
{IMGFMT_0RGB, 32, LSBFirst, 0x0000FF00, 0x00FF0000, 0xFF000000},
{IMGFMT_0BGR, 32, MSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000},
{IMGFMT_0BGR, 32, LSBFirst, 0xFF000000, 0x00FF0000, 0x0000FF00},
{IMGFMT_RGB0, 32, MSBFirst, 0xFF000000, 0x00FF0000, 0x0000FF00},
{IMGFMT_RGB0, 32, LSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000},
{IMGFMT_BGR0, 32, MSBFirst, 0x0000FF00, 0x00FF0000, 0xFF000000},
{IMGFMT_BGR0, 32, LSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF},
{IMGFMT_RGB565, 16, LSBFirst, 0x0000F800, 0x000007E0, 0x0000001F},
{IMGFMT_RGB30, 32, LSBFirst, BM(20, 10), BM(10, 10), BM(0, 10)},
{0}
};
static int reconfig(struct vo *vo, struct mp_image_params *fmt) static int reconfig(struct vo *vo, struct mp_image_params *fmt)
{ {
@ -232,23 +211,33 @@ static bool resize(struct vo *vo)
return false; return false;
} }
const struct fmt_entry *fmte = mp_to_x_fmt; int mpfmt = 0;
while (fmte->mpfmt) { for (int fmt = IMGFMT_START; fmt < IMGFMT_END; fmt++) {
if (fmte->depth == p->myximage[0]->bits_per_pixel && struct mp_imgfmt_desc desc = mp_imgfmt_get_desc(fmt);
fmte->byte_order == p->myximage[0]->byte_order && if ((desc.flags & MP_IMGFLAG_HAS_COMPS) && desc.num_planes == 1 &&
fmte->red_mask == p->myximage[0]->red_mask && mp_imgfmt_get_component_type(fmt) == MP_COMPONENT_TYPE_UINT &&
fmte->green_mask == p->myximage[0]->green_mask && mp_imgfmt_get_forced_csp(fmt) == MP_CSP_RGB &&
fmte->blue_mask == p->myximage[0]->blue_mask) !(desc.flags & MP_IMGFLAG_ALPHA) &&
desc.bpp[0] <= 32 &&
p->myximage[0]->bits_per_pixel == desc.bpp[0] &&
p->myximage[0]->byte_order == LSBFirst &&
p->myximage[0]->red_mask == MAKE_MASK(desc.comps[0]) &&
p->myximage[0]->green_mask == MAKE_MASK(desc.comps[1]) &&
p->myximage[0]->blue_mask == MAKE_MASK(desc.comps[2]))
{
mpfmt = fmt;
break; break;
fmte++; }
} }
if (!fmte->mpfmt) {
if (!mpfmt) {
MP_ERR(vo, "X server image format not supported, use another VO.\n"); MP_ERR(vo, "X server image format not supported, use another VO.\n");
return false; return false;
} }
MP_VERBOSE(vo, "Using mp format: %s\n", mp_imgfmt_to_name(mpfmt));
p->sws->dst = (struct mp_image_params) { p->sws->dst = (struct mp_image_params) {
.imgfmt = fmte->mpfmt, .imgfmt = mpfmt,
.w = p->dst_w, .w = p->dst_w,
.h = p->dst_h, .h = p->dst_h,
.p_w = 1, .p_w = 1,