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

Support for different endianness on client and server with -vo x11 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21602 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-12-12 19:13:48 +00:00
parent ba288eb9b0
commit b333ae1922
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libvo/vo_x11.c
View File

@ -85,6 +85,7 @@ static uint32_t image_width;
static uint32_t image_height; static uint32_t image_height;
static uint32_t in_format; static uint32_t in_format;
static uint32_t out_format = 0; static uint32_t out_format = 0;
static int out_offset;
static int srcW = -1; static int srcW = -1;
static int srcH = -1; static int srcH = -1;
static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing
@ -552,6 +553,17 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
default: default:
draw_alpha_fnc = draw_alpha_null; draw_alpha_fnc = draw_alpha_null;
} }
out_offset = 0;
// for these formats conversion is currently not support and
// we can easily "emulate" them.
if (out_format & 64 && IMGFMT_IS_RGB(out_format) || IMGFMT_IS_BGR(out_format)) {
out_format &= ~64;
#ifdef WORDS_BIGENDIAN
out_offset = 1;
#else
out_offset = -1;
#endif
}
/* always allocate swsContext as size could change between frames */ /* always allocate swsContext as size could change between frames */
swsContext = swsContext =
@ -571,6 +583,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
static void Display_Image(XImage * myximage, uint8_t * ImageData) static void Display_Image(XImage * myximage, uint8_t * ImageData)
{ {
myximage->data += out_offset;
#ifdef HAVE_SHM #ifdef HAVE_SHM
if (Shmem_Flag) if (Shmem_Flag)
{ {
@ -588,6 +601,7 @@ static void Display_Image(XImage * myximage, uint8_t * ImageData)
(vo_dheight - myximage->height) / 2, dst_width, (vo_dheight - myximage->height) / 2, dst_width,
myximage->height); myximage->height);
} }
myximage->data -= out_offset;
} }
static void draw_osd(void) static void draw_osd(void)