RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-14 19:11:53 +00:00
Code Issues Releases Wiki Activity

vo_x11: partially restore operation on bad endian systems

Browse Source 
For testing in VMs I guess?

This features a very broken hack that probably works. Though I didn't
test the packed format case. Again, the mismatch is essentially due to
big endian byte addresses decreasing as bit addresses increase, so you
can't represent a bit position in a byte stream with a single address,
which the mpv metadata does.

OSD is broken because repack.c doesn't support big endian. You'll have
to live with it.
This commit is contained in:
wm4 2020-06-17 19:34:19 +02:00
parent fd9c570f22
commit b97f57bfd4
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
video/out/vo_x11.c
View File

@ -207,13 +207,29 @@ static bool resize(struct vo *vo)
(desc.flags & MP_IMGFLAG_NE) && !(desc.flags & MP_IMGFLAG_ALPHA) &&
desc.bpp[0] <= 8 * sizeof(unsigned long) &&
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]))
p->myximage[0]->byte_order == MP_SELECT_LE_BE(LSBFirst, MSBFirst))
{
mpfmt = fmt;
break;
// desc.comps[] uses little endian bit offsets, so "swap" the
// offsets here.
if (MP_SELECT_LE_BE(0, 1)) {
// Except for formats that use byte swapping; for these, the
// offsets are in native endian. There is no way to distinguish
// which one a given format is (could even be both), and using
// mp_find_other_endian() is just a guess.
if (!mp_find_other_endian(fmt)) {
for (int c = 0; c < 3; c++) {
desc.comps[c].offset =
desc.bpp[0] - desc.comps[c].size -desc.comps[c].offset;
}
}
}
if (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;
}
}
}