annotate libvo/vo_x11.c @ 33667:adb10970ec83

Fix bug introduced as a side effect in r33750. It was no longer possible to start gmplayer from the command line with a file argument. Every time gmplayer is called with a file argument this file goes into the GUI specific playlist. As a side effect, GUI's file(name) to play and MPlayer's filename point to the same address. guiInit() pointlessly tries to set GUI's filename (free and strdup) from MPlayer's filename instead of getting it from its playlist. The previous memset set GUI's filename to NULL rendering the free() effectless while now such an operation on the same address to strdup() afterwards isn't a good idea. Remove the pointless code.
author ib
date Tue, 28 Jun 2011 15:00:05 +0000
parents ab72da1e2a28
children 26a20c12a5fc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28446
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
1 /*
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
2 * This file is part of MPlayer.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
3 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
5 * it under the terms of the GNU General Public License as published by
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
7 * (at your option) any later version.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
8 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
12 * GNU General Public License for more details.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
13 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
14 * You should have received a copy of the GNU General Public License along
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28149
diff changeset
17 */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23 #include "config.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 #include "video_out_internal.h"
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32467
diff changeset
26 #include "libmpcodecs/vf.h"
27972
f7b92cea7436 Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.
reimar
parents: 27943
diff changeset
27 #include "aspect.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 #include <X11/Xutil.h>
4036
76ea6f97ebb7 added rgb24to32 instead of c converter
alex
parents: 4017
diff changeset
32
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
34
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
35 #include "x11_common.h"
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
36
11690
860bc06f32ca just the same include reordering as in vo_xv (codemetics :)
alex
parents: 11542
diff changeset
37 #ifdef HAVE_SHM
860bc06f32ca just the same include reordering as in vo_xv (codemetics :)
alex
parents: 11542
diff changeset
38 #include <sys/ipc.h>
860bc06f32ca just the same include reordering as in vo_xv (codemetics :)
alex
parents: 11542
diff changeset
39 #include <sys/shm.h>
860bc06f32ca just the same include reordering as in vo_xv (codemetics :)
alex
parents: 11542
diff changeset
40 #include <X11/extensions/XShm.h>
860bc06f32ca just the same include reordering as in vo_xv (codemetics :)
alex
parents: 11542
diff changeset
41
860bc06f32ca just the same include reordering as in vo_xv (codemetics :)
alex
parents: 11542
diff changeset
42 static int Shmem_Flag;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
43
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25626
diff changeset
44 //static int Quiet_Flag; Here also what is this for. It's used but isn't initialized?
11690
860bc06f32ca just the same include reordering as in vo_xv (codemetics :)
alex
parents: 11542
diff changeset
45 static XShmSegmentInfo Shminfo[1];
860bc06f32ca just the same include reordering as in vo_xv (codemetics :)
alex
parents: 11542
diff changeset
46 static int gXErrorFlag;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
47 static int CompletionType = -1;
11690
860bc06f32ca just the same include reordering as in vo_xv (codemetics :)
alex
parents: 11542
diff changeset
48 #endif
860bc06f32ca just the same include reordering as in vo_xv (codemetics :)
alex
parents: 11542
diff changeset
49
32467
fbe5c829c69b Move libvo/sub.[ch] from libvo to sub.
cigaes
parents: 31416
diff changeset
50 #include "sub/sub.h"
350
601822cc8c52 applied MMX2 memcpy() patch by Nick Kurshev
arpi_esp
parents: 326
diff changeset
51
18861
8579acff875e Move postproc ---> libswscale
lucabe
parents: 18746
diff changeset
52 #include "libswscale/swscale.h"
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 13056
diff changeset
53 #include "libmpcodecs/vf_scale.h"
18746
497ebe3ecc2b Software Scaler headers usage cleanup
lucabe
parents: 18715
diff changeset
54 #define MODE_RGB 0x1
497ebe3ecc2b Software Scaler headers usage cleanup
lucabe
parents: 18715
diff changeset
55 #define MODE_BGR 0x2
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
56
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 13056
diff changeset
57 #include "mp_msg.h"
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 18116
diff changeset
58 #include "help_mp.h"
4734
cc375edb5eda added support for runtime fullscreen switching
alex
parents: 4726
diff changeset
59
25216
3aee342be929 Make vo info structs const
reimar
parents: 24045
diff changeset
60 static const vo_info_t info = {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
61 "X11 ( XImage/Shm )",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
62 "x11",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
63 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
64 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66
25220
c9e9ac2008c2 Mark the vo_functions_t definitions as const where possible.
reimar
parents: 25216
diff changeset
67 const LIBVO_EXTERN(x11)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 /* private prototypes */
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
69 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
70 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
71 int stride);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
73 /* local data */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
74 static unsigned char *ImageData;
21585
e54f539c9b5d Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents: 21584
diff changeset
75 //! original unaligned pointer for free
e54f539c9b5d Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents: 21584
diff changeset
76 static unsigned char *ImageDataOrig;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78 /* X11 related variables */
7764
13c36b2d1d45 -fixed-vo support
pontscho
parents: 7689
diff changeset
79 static XImage *myximage = NULL;
23381
300e9b7c499f Remove some unused variables, patch by timwoj ieee org.
diego
parents: 23376
diff changeset
80 static int depth, bpp;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 static XWindowAttributes attribs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10728
diff changeset
83 static int int_pause;
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10728
diff changeset
84
2969
291f45785de9 fix to compile when SHM is disabled
alex
parents: 2732
diff changeset
85 static int Flip_Flag;
4661
4df2400b0527 -fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents: 4658
diff changeset
86 static int zoomFlag;
2969
291f45785de9 fix to compile when SHM is disabled
alex
parents: 2732
diff changeset
87
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
88
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90 static uint32_t image_height;
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
91 static uint32_t in_format;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
92 static uint32_t out_format = 0;
21586
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
93 static int out_offset;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
94 static int srcW = -1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
95 static int srcH = -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
96
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
97 static int old_vo_dwidth = -1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
98 static int old_vo_dheight = -1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
99
22886
71b3e04d0555 "()" to "(void)" function param list fixes
uau
parents: 22232
diff changeset
100 static void check_events(void)
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
101 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
102 int ret = vo_x11_check_events(mDisplay);
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
103
27977
452231ce45b9 Clear the whole window on resize in vo_x11 since we do not
reimar
parents: 27976
diff changeset
104 if (ret & VO_EVENT_RESIZE)
452231ce45b9 Clear the whole window on resize in vo_x11 since we do not
reimar
parents: 27976
diff changeset
105 vo_x11_clearwindow(mDisplay, vo_window);
452231ce45b9 Clear the whole window on resize in vo_x11 since we do not
reimar
parents: 27976
diff changeset
106 else if (ret & VO_EVENT_EXPOSE)
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
107 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width,
33420
ab72da1e2a28 Fix vo_x11/xv window background clearing.
iive
parents: 33326
diff changeset
108 myximage->height, vo_fs);
27976
3f4990a693c2 Simplify vo_x11 check_events function
reimar
parents: 27975
diff changeset
109 if (ret & VO_EVENT_EXPOSE && int_pause)
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
110 flip_page();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
111 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
112
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
113 static void draw_alpha_32(int x0, int y0, int w, int h, unsigned char *src,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
114 unsigned char *srca, int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
115 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
116 vo_draw_alpha_rgb32(w, h, src, srca, stride,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
117 ImageData + 4 * (y0 * image_width + x0),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
118 4 * image_width);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
120
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
121 static void draw_alpha_24(int x0, int y0, int w, int h, unsigned char *src,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
122 unsigned char *srca, int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
123 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
124 vo_draw_alpha_rgb24(w, h, src, srca, stride,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
125 ImageData + 3 * (y0 * image_width + x0),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
126 3 * image_width);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
127 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
128
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
129 static void draw_alpha_16(int x0, int y0, int w, int h, unsigned char *src,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
130 unsigned char *srca, int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
131 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
132 vo_draw_alpha_rgb16(w, h, src, srca, stride,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
133 ImageData + 2 * (y0 * image_width + x0),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
134 2 * image_width);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
135 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
136
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
137 static void draw_alpha_15(int x0, int y0, int w, int h, unsigned char *src,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
138 unsigned char *srca, int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
139 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
140 vo_draw_alpha_rgb15(w, h, src, srca, stride,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
141 ImageData + 2 * (y0 * image_width + x0),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
142 2 * image_width);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
143 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
144
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
145 static void draw_alpha_null(int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
146 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
147 int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
148 {
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
149 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
150
18746
497ebe3ecc2b Software Scaler headers usage cleanup
lucabe
parents: 18715
diff changeset
151 static struct SwsContext *swsContext = NULL;
497ebe3ecc2b Software Scaler headers usage cleanup
lucabe
parents: 18715
diff changeset
152 static int dst_width;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
153
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
154 static XVisualInfo vinfo;
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
155
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 16171
diff changeset
156 static void getMyXImage(void)
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
157 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
158 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
159 if (mLocalDisplay && XShmQueryExtension(mDisplay))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
160 Shmem_Flag = 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
161 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
162 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
163 Shmem_Flag = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
164 mp_msg(MSGT_VO, MSGL_WARN,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
165 "Shared memory not supported\nReverting to normal Xlib\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
166 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
167 if (Shmem_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
168 CompletionType = XShmGetEventBase(mDisplay) + ShmCompletion;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
169
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
170 if (Shmem_Flag)
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
171 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
172 myximage =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
173 XShmCreateImage(mDisplay, vinfo.visual, depth, ZPixmap, NULL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
174 &Shminfo[0], image_width, image_height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
175 if (myximage == NULL)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
176 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
177 mp_msg(MSGT_VO, MSGL_WARN,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
178 "Shared memory error,disabling ( Ximage error )\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
179 goto shmemerror;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
180 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
181 Shminfo[0].shmid = shmget(IPC_PRIVATE,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
182 myximage->bytes_per_line *
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
183 myximage->height, IPC_CREAT | 0777);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
184 if (Shminfo[0].shmid < 0)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
185 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
186 XDestroyImage(myximage);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
187 mp_msg(MSGT_VO, MSGL_V, "%s\n", strerror(errno));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
188 //perror( strerror( errno ) );
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
189 mp_msg(MSGT_VO, MSGL_WARN,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
190 "Shared memory error,disabling ( seg id error )\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
191 goto shmemerror;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
192 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
193 Shminfo[0].shmaddr = (char *) shmat(Shminfo[0].shmid, 0, 0);
3209
0b172eb639f1 swscaler cleanup
michael
parents: 3003
diff changeset
194
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
195 if (Shminfo[0].shmaddr == ((char *) -1))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
196 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
197 XDestroyImage(myximage);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
198 if (Shminfo[0].shmaddr != ((char *) -1))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
199 shmdt(Shminfo[0].shmaddr);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
200 mp_msg(MSGT_VO, MSGL_WARN,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
201 "Shared memory error,disabling ( address error )\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
202 goto shmemerror;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
203 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
204 myximage->data = Shminfo[0].shmaddr;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
205 ImageData = (unsigned char *) myximage->data;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
206 Shminfo[0].readOnly = False;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
207 XShmAttach(mDisplay, &Shminfo[0]);
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
208
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
209 XSync(mDisplay, False);
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
210
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
211 if (gXErrorFlag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
212 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
213 XDestroyImage(myximage);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
214 shmdt(Shminfo[0].shmaddr);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
215 mp_msg(MSGT_VO, MSGL_WARN, "Shared memory error,disabling.\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
216 gXErrorFlag = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
217 goto shmemerror;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
218 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
219 shmctl(Shminfo[0].shmid, IPC_RMID, 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
220
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
221 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
222 static int firstTime = 1;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
223
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
224 if (firstTime)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
225 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
226 mp_msg(MSGT_VO, MSGL_V, "Sharing memory.\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
227 firstTime = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
228 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
229 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
230 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
231 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
232 shmemerror:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
233 Shmem_Flag = 0;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
234 #endif
21584
3ddf91e141a3 Use XCreateImage instead of XGetImage, this is not only more correct and
reimar
parents: 20399
diff changeset
235 myximage = XCreateImage(mDisplay, vinfo.visual, depth, ZPixmap,
3ddf91e141a3 Use XCreateImage instead of XGetImage, this is not only more correct and
reimar
parents: 20399
diff changeset
236 0, NULL, image_width, image_height, 8, 0);
21585
e54f539c9b5d Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents: 21584
diff changeset
237 ImageDataOrig = malloc(myximage->bytes_per_line * image_height + 32);
e54f539c9b5d Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents: 21584
diff changeset
238 myximage->data = ImageDataOrig + 16 - ((long)ImageDataOrig & 15);
21584
3ddf91e141a3 Use XCreateImage instead of XGetImage, this is not only more correct and
reimar
parents: 20399
diff changeset
239 memset(myximage->data, 0, myximage->bytes_per_line * image_height);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
240 ImageData = myximage->data;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
241 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
242 }
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
243 #endif
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
244 }
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
245
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 16171
diff changeset
246 static void freeMyXImage(void)
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
247 {
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
248 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
249 if (Shmem_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
250 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
251 XShmDetach(mDisplay, &Shminfo[0]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
252 XDestroyImage(myximage);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
253 shmdt(Shminfo[0].shmaddr);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
254 } else
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
255 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
256 {
21585
e54f539c9b5d Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents: 21584
diff changeset
257 myximage->data = ImageDataOrig;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
258 XDestroyImage(myximage);
21585
e54f539c9b5d Align image data pointer, this is also in preparation of an upcoming patch
reimar
parents: 21584
diff changeset
259 ImageDataOrig = NULL;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
260 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
261 myximage = NULL;
21584
3ddf91e141a3 Use XCreateImage instead of XGetImage, this is not only more correct and
reimar
parents: 20399
diff changeset
262 ImageData = NULL;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
263 }
2218
d9ea650b2c24 yv12 scaling at 24/32bpp with -zoom
arpi
parents: 2094
diff changeset
264
29401
f01023c524c3 Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents: 29263
diff changeset
265 #if HAVE_BIGENDIAN
20399
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
266 #define BO_NATIVE MSBFirst
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
267 #define BO_NONNATIVE LSBFirst
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
268 #else
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
269 #define BO_NATIVE LSBFirst
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
270 #define BO_NONNATIVE MSBFirst
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
271 #endif
25239
c1b3a06a3c6e Format mapping table should be const
reimar
parents: 25220
diff changeset
272 const struct fmt2Xfmtentry_s {
20399
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
273 uint32_t mpfmt;
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
274 int byte_order;
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
275 unsigned red_mask;
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
276 unsigned green_mask;
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
277 unsigned blue_mask;
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
278 } fmt2Xfmt[] = {
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
279 {IMGFMT_RGB8, BO_NATIVE, 0x00000007, 0x00000038, 0x000000C0},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
280 {IMGFMT_RGB8, BO_NONNATIVE, 0x00000007, 0x00000038, 0x000000C0},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
281 {IMGFMT_BGR8, BO_NATIVE, 0x000000E0, 0x0000001C, 0x00000003},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
282 {IMGFMT_BGR8, BO_NONNATIVE, 0x000000E0, 0x0000001C, 0x00000003},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
283 {IMGFMT_RGB15, BO_NATIVE, 0x0000001F, 0x000003E0, 0x00007C00},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
284 {IMGFMT_BGR15, BO_NATIVE, 0x00007C00, 0x000003E0, 0x0000001F},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
285 {IMGFMT_RGB16, BO_NATIVE, 0x0000001F, 0x000007E0, 0x0000F800},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
286 {IMGFMT_BGR16, BO_NATIVE, 0x0000F800, 0x000007E0, 0x0000001F},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
287 {IMGFMT_RGB24, MSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
288 {IMGFMT_RGB24, LSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
289 {IMGFMT_BGR24, MSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
290 {IMGFMT_BGR24, LSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
291 {IMGFMT_RGB32, BO_NATIVE, 0x000000FF, 0x0000FF00, 0x00FF0000},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
292 {IMGFMT_RGB32, BO_NONNATIVE, 0xFF000000, 0x00FF0000, 0x0000FF00},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
293 {IMGFMT_BGR32, BO_NATIVE, 0x00FF0000, 0x0000FF00, 0x000000FF},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
294 {IMGFMT_BGR32, BO_NONNATIVE, 0x0000FF00, 0x00FF0000, 0xFF000000},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
295 {IMGFMT_ARGB, MSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
296 {IMGFMT_ARGB, LSBFirst, 0x0000FF00, 0x00FF0000, 0xFF000000},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
297 {IMGFMT_ABGR, MSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
298 {IMGFMT_ABGR, LSBFirst, 0xFF000000, 0x00FF0000, 0x0000FF00},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
299 {IMGFMT_RGBA, MSBFirst, 0xFF000000, 0x00FF0000, 0x0000FF00},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
300 {IMGFMT_RGBA, LSBFirst, 0x000000FF, 0x0000FF00, 0x00FF0000},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
301 {IMGFMT_BGRA, MSBFirst, 0x0000FF00, 0x00FF0000, 0xFF000000},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
302 {IMGFMT_BGRA, LSBFirst, 0x00FF0000, 0x0000FF00, 0x000000FF},
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
303 {0, 0, 0, 0, 0}
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
304 };
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
305
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
306 static int config(uint32_t width, uint32_t height, uint32_t d_width,
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
307 uint32_t d_height, uint32_t flags, char *title,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
308 uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
309 {
1110
71b8911ec3da -Wall like cleanup
al3x
parents: 922
diff changeset
310 // int screen;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
311
1110
71b8911ec3da -Wall like cleanup
al3x
parents: 922
diff changeset
312 // int interval, prefer_blank, allow_exp, nothing;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
313 Colormap theCmap;
25239
c1b3a06a3c6e Format mapping table should be const
reimar
parents: 25220
diff changeset
314 const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
315
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
316 #ifdef CONFIG_XF86VM
27943
c25cbf15a51c Simplify handling of "flags" parameter
reimar
parents: 27942
diff changeset
317 int vm = flags & VOFLAG_MODESWITCHING;
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
318 #endif
27943
c25cbf15a51c Simplify handling of "flags" parameter
reimar
parents: 27942
diff changeset
319 Flip_Flag = flags & VOFLAG_FLIPPING;
c25cbf15a51c Simplify handling of "flags" parameter
reimar
parents: 27942
diff changeset
320 zoomFlag = flags & VOFLAG_SWSCALE;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
321
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
322 old_vo_dwidth = -1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
323 old_vo_dheight = -1;
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5999
diff changeset
324
27880
a28ca0971d9a Cosmetic changes to vo_x11 to reduce diff to vo_xv for future refactoring.
reimar
parents: 27879
diff changeset
325 int_pause = 0;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
326 if (!title)
17787
6eb3a513abb9 remove useless and memleak-causing strdup
reimar
parents: 17566
diff changeset
327 title = "MPlayer X11 (XImage/Shm) render";
4813
15e95b9cf191 using vo_dx, vo_dy
alex
parents: 4808
diff changeset
328
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
329 in_format = format;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
330 srcW = width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
331 srcH = height;
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10728
diff changeset
332
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
333 XGetWindowAttributes(mDisplay, mRootWin, &attribs);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
334 depth = attribs.depth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
335
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
336 if (depth != 15 && depth != 16 && depth != 24 && depth != 32)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
337 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
338 Visual *visual;
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
339
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
340 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
341 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
342 if (!XMatchVisualInfo(mDisplay, mScreen, depth, DirectColor, &vinfo) ||
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
343 (WinID > 0
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
344 && vinfo.visualid != XVisualIDFromVisual(attribs.visual)))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
345 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
1746
6e7da6f362ab add half gui support
pontscho
parents: 1647
diff changeset
346
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29062
diff changeset
347 /* set image size (which is indeed neither the input nor output size),
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29062
diff changeset
348 if zoom is on it will be changed during draw_slice anyway so we don't duplicate the aspect code here
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
349 */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
350 image_width = (width + 7) & (~7);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
351 image_height = height;
4661
4df2400b0527 -fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents: 4658
diff changeset
352
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
353 {
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
354 #ifdef CONFIG_XF86VM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
355 if (vm)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
356 {
27890
a4e2700e9381 Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents: 27889
diff changeset
357 vo_vm_switch();
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
358 }
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
359 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
360
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
361 theCmap = vo_x11_create_colormap(&vinfo);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
362
27891
8742bcad99b5 Use vo_dwidth/vo_dheight for creating the windows instead of d_width/d_height.
reimar
parents: 27890
diff changeset
363 vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, vo_dwidth, vo_dheight,
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23381
diff changeset
364 flags, theCmap, "x11", title);
27927
6f199f065e15 Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents: 27903
diff changeset
365 if (WinID > 0)
6f199f065e15 Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents: 27903
diff changeset
366 depth = vo_x11_update_geometry();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
367
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
368 #ifdef CONFIG_XF86VM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
369 if (vm)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
370 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
371 /* Grab the mouse pointer in our window */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
372 if (vo_grabpointer)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
373 XGrabPointer(mDisplay, vo_window, True, 0,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
374 GrabModeAsync, GrabModeAsync,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
375 vo_window, None, CurrentTime);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
376 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
377 }
2094
dc11de07b5e7 grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents: 1924
diff changeset
378 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
379 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
380
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
381 if (myximage)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
382 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
383 freeMyXImage();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
384 sws_freeContext(swsContext);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
385 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
386 getMyXImage();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
387
20399
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
388 while (fmte->mpfmt) {
27762
7efce8fe3a04 fixed image format detection for 15 bit color depths
faust3
parents: 27412
diff changeset
389 int depth = IMGFMT_RGB_DEPTH(fmte->mpfmt);
7efce8fe3a04 fixed image format detection for 15 bit color depths
faust3
parents: 27412
diff changeset
390 /* bits_per_pixel in X seems to be set to 16 for 15 bit formats
7efce8fe3a04 fixed image format detection for 15 bit color depths
faust3
parents: 27412
diff changeset
391 => force depth to 16 so that only the color masks are used for the format check */
7efce8fe3a04 fixed image format detection for 15 bit color depths
faust3
parents: 27412
diff changeset
392 if (depth == 15)
7efce8fe3a04 fixed image format detection for 15 bit color depths
faust3
parents: 27412
diff changeset
393 depth = 16;
7efce8fe3a04 fixed image format detection for 15 bit color depths
faust3
parents: 27412
diff changeset
394
7efce8fe3a04 fixed image format detection for 15 bit color depths
faust3
parents: 27412
diff changeset
395 if (depth == myximage->bits_per_pixel &&
20399
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
396 fmte->byte_order == myximage->byte_order &&
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
397 fmte->red_mask == myximage->red_mask &&
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
398 fmte->green_mask == myximage->green_mask &&
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
399 fmte->blue_mask == myximage->blue_mask)
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
400 break;
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
401 fmte++;
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
402 }
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
403 if (!fmte->mpfmt) {
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
404 mp_msg(MSGT_VO, MSGL_ERR,
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
405 "X server image format not supported, please contact the developers\n");
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
406 return -1;
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
407 }
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
408 out_format = fmte->mpfmt;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
409 switch ((bpp = myximage->bits_per_pixel))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
410 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
411 case 24:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
412 draw_alpha_fnc = draw_alpha_24;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
413 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
414 case 32:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
415 draw_alpha_fnc = draw_alpha_32;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
416 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
417 case 15:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
418 case 16:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
419 if (depth == 15)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
420 draw_alpha_fnc = draw_alpha_15;
20399
27aa9329d4f7 Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents: 20196
diff changeset
421 else
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
422 draw_alpha_fnc = draw_alpha_16;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
423 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
424 default:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
425 draw_alpha_fnc = draw_alpha_null;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
426 }
21586
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
427 out_offset = 0;
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
428 // for these formats conversion is currently not support and
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
429 // we can easily "emulate" them.
21599
fe48c337a269 10l, missing () in check for 32bit endian-conversion hack
reimar
parents: 21586
diff changeset
430 if (out_format & 64 && (IMGFMT_IS_RGB(out_format) || IMGFMT_IS_BGR(out_format))) {
21586
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
431 out_format &= ~64;
29401
f01023c524c3 Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents: 29263
diff changeset
432 #if HAVE_BIGENDIAN
21586
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
433 out_offset = 1;
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
434 #else
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
435 out_offset = -1;
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
436 #endif
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
437 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
438
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
439 /* always allocate swsContext as size could change between frames */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
440 swsContext =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
441 sws_getContextFromCmdLine(width, height, in_format, width, height,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
442 out_format);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
443 if (!swsContext)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
444 return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
445
18746
497ebe3ecc2b Software Scaler headers usage cleanup
lucabe
parents: 18715
diff changeset
446 dst_width = width;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
447 //printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
448
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
449 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
450 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
451
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
452 static void Display_Image(XImage * myximage, uint8_t * ImageData)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
453 {
27901
88fad4f51a94 respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents: 27892
diff changeset
454 int x = (vo_dwidth - dst_width) / 2;
88fad4f51a94 respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents: 27892
diff changeset
455 int y = (vo_dheight - myximage->height) / 2;
27975
806c541d03dd Do not draw in window if our image has not yet been adjusted to the new window size.
reimar
parents: 27974
diff changeset
456
806c541d03dd Do not draw in window if our image has not yet been adjusted to the new window size.
reimar
parents: 27974
diff changeset
457 // do not draw if the image needs rescaling
806c541d03dd Do not draw in window if our image has not yet been adjusted to the new window size.
reimar
parents: 27974
diff changeset
458 if ((old_vo_dwidth != vo_dwidth || old_vo_dheight != vo_dheight) && zoomFlag)
806c541d03dd Do not draw in window if our image has not yet been adjusted to the new window size.
reimar
parents: 27974
diff changeset
459 return;
806c541d03dd Do not draw in window if our image has not yet been adjusted to the new window size.
reimar
parents: 27974
diff changeset
460
27901
88fad4f51a94 respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents: 27892
diff changeset
461 if (WinID == 0) {
88fad4f51a94 respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents: 27892
diff changeset
462 x = vo_dx;
88fad4f51a94 respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents: 27892
diff changeset
463 y = vo_dy;
88fad4f51a94 respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents: 27892
diff changeset
464 }
21586
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
465 myximage->data += out_offset;
3003
16a593a1e6ed changed SH_MEM to HAVE_SHM according to configure
alex
parents: 2969
diff changeset
466 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
467 if (Shmem_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
468 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
469 XShmPutImage(mDisplay, vo_window, vo_gc, myximage,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
470 0, 0,
27901
88fad4f51a94 respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents: 27892
diff changeset
471 x, y, dst_width,
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
472 myximage->height, True);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
473 } else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
474 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
475 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
476 XPutImage(mDisplay, vo_window, vo_gc, myximage,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
477 0, 0,
27901
88fad4f51a94 respect -vf dsize etc. also for -rootwin, just like vo_xv does.
reimar
parents: 27892
diff changeset
478 x, y, dst_width,
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
479 myximage->height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
480 }
21586
5a1e078720e7 Support for different endianness on client and server with -vo x11
reimar
parents: 21585
diff changeset
481 myximage->data -= out_offset;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
482 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
483
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1137
diff changeset
484 static void draw_osd(void)
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
485 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
486 vo_draw_text(image_width, image_height, draw_alpha_fnc);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
487 }
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1137
diff changeset
488
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
489 static void flip_page(void)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
490 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
491 Display_Image(myximage, ImageData);
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1137
diff changeset
492 XSync(mDisplay, False);
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
493 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
494
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
495 static int draw_slice(uint8_t * src[], int stride[], int w, int h,
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
496 int x, int y)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
497 {
29062
6a0a30aa2b4a Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libvo.
reimar
parents: 28446
diff changeset
498 uint8_t *dst[MP_MAX_PLANES] = {NULL};
6a0a30aa2b4a Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libvo.
reimar
parents: 28446
diff changeset
499 int dstStride[MP_MAX_PLANES] = {0};
6059
c0ae8c0eda72 fix Arpi's bugs
pontscho
parents: 6045
diff changeset
500
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
501 if ((old_vo_dwidth != vo_dwidth
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
502 || old_vo_dheight != vo_dheight) /*&& y==0 */ && zoomFlag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
503 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
504 int newW = vo_dwidth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
505 int newH = vo_dheight;
18746
497ebe3ecc2b Software Scaler headers usage cleanup
lucabe
parents: 18715
diff changeset
506 struct SwsContext *oldContext = swsContext;
4641
b7f340349470 allways use swScaler
michael
parents: 4627
diff changeset
507
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
508 old_vo_dwidth = vo_dwidth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
509 old_vo_dheight = vo_dheight;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
510
27972
f7b92cea7436 Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.
reimar
parents: 27943
diff changeset
511 if (vo_fs)
f7b92cea7436 Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.
reimar
parents: 27943
diff changeset
512 aspect(&newW, &newH, A_ZOOM);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
513 if (sws_flags == 0)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
514 newW &= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed
4627
3db7ee2ac7b0 bgr15 / bgr16 input support (with -zoom)
michael
parents: 4596
diff changeset
515
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
516 swsContext = sws_getContextFromCmdLine(srcW, srcH, in_format,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
517 newW, newH, out_format);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
518 if (swsContext)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
519 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
520 image_width = (newW + 7) & (~7);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
521 image_height = newH;
4420
a7bac05524a1 real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents: 4382
diff changeset
522
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
523 freeMyXImage();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
524 getMyXImage();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
525 sws_freeContext(oldContext);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
526 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
527 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
528 swsContext = oldContext;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
529 }
18746
497ebe3ecc2b Software Scaler headers usage cleanup
lucabe
parents: 18715
diff changeset
530 dst_width = newW;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
531 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
532
23284
dc2c6e97119c Simplify -flip handling on vo_x11.c
reimar
parents: 23283
diff changeset
533 dstStride[0] = image_width * ((bpp + 7) / 8);
dc2c6e97119c Simplify -flip handling on vo_x11.c
reimar
parents: 23283
diff changeset
534 dst[0] = ImageData;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
535 if (Flip_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
536 {
23284
dc2c6e97119c Simplify -flip handling on vo_x11.c
reimar
parents: 23283
diff changeset
537 dst[0] += dstStride[0] * (image_height - 1);
dc2c6e97119c Simplify -flip handling on vo_x11.c
reimar
parents: 23283
diff changeset
538 dstStride[0] = -dstStride[0];
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
539 }
30150
16c71b965952 Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).
reimar
parents: 29401
diff changeset
540 sws_scale(swsContext, src, stride, y, h, dst, dstStride);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
541 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
542 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
543
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
544 static int draw_frame(uint8_t * src[])
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
545 {
27883
96831cf06109 Remove code from unused and since ages deprecated draw_frame function.
reimar
parents: 27881
diff changeset
546 return VO_ERROR;
7683
2f802d9323de - implemented draw_image()
arpi
parents: 7539
diff changeset
547 }
2f802d9323de - implemented draw_image()
arpi
parents: 7539
diff changeset
548
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
549 static uint32_t get_image(mp_image_t * mpi)
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
550 {
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
551 if (zoomFlag ||
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
552 !IMGFMT_IS_BGR(mpi->imgfmt) ||
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
553 (IMGFMT_BGR_DEPTH(mpi->imgfmt) != vo_depthonscreen) ||
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
554 ((mpi->type != MP_IMGTYPE_STATIC)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
555 && (mpi->type != MP_IMGTYPE_TEMP))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
556 || (mpi->flags & MP_IMGFLAG_PLANAR)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
557 || (mpi->flags & MP_IMGFLAG_YUV) || (mpi->width != image_width)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
558 || (mpi->height != image_height))
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25962
diff changeset
559 return VO_FALSE;
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
560
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
561 if (Flip_Flag)
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
562 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
563 mpi->stride[0] = -image_width * ((bpp + 7) / 8);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
564 mpi->planes[0] = ImageData - mpi->stride[0] * (image_height - 1);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
565 } else
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
566 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
567 mpi->stride[0] = image_width * ((bpp + 7) / 8);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
568 mpi->planes[0] = ImageData;
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
569 }
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
570 mpi->flags |= MP_IMGFLAG_DIRECT;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
571
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25962
diff changeset
572 return VO_TRUE;
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
573 }
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
574
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
575 static int query_format(uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
576 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
577 mp_msg(MSGT_VO, MSGL_DBG2,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
578 "vo_x11: query_format was called: %x (%s)\n", format,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
579 vo_format_name(format));
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
580 if (IMGFMT_IS_BGR(format))
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
581 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
582 if (IMGFMT_BGR_DEPTH(format) <= 8)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
583 return 0; // TODO 8bpp not yet fully implemented
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
584 if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen)
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 13787
diff changeset
585 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP |
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
586 VFCAP_ACCEPT_STRIDE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
587 else
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 13787
diff changeset
588 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP |
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
589 VFCAP_ACCEPT_STRIDE;
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
590 }
325
b2fd5c172f80 vo_x11 query_format fix
laaz
parents: 324
diff changeset
591
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
592 switch (format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
593 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29062
diff changeset
594 // case IMGFMT_BGR8:
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
595 // case IMGFMT_BGR15:
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
596 // case IMGFMT_BGR16:
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
597 // case IMGFMT_BGR24:
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
598 // case IMGFMT_BGR32:
6694
9291268a3603 1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents: 6693
diff changeset
599 // return 0x2;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29062
diff changeset
600 // case IMGFMT_YUY2:
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
601 case IMGFMT_I420:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
602 case IMGFMT_IYUV:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
603 case IMGFMT_YV12:
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 13787
diff changeset
604 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
605 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
606 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
607 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
608
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
609
7683
2f802d9323de - implemented draw_image()
arpi
parents: 7539
diff changeset
610 static void uninit(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
611 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
612 if (!myximage)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
613 return;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
614
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
615 freeMyXImage();
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
616
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
617 #ifdef CONFIG_XF86VM
27890
a4e2700e9381 Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents: 27889
diff changeset
618 vo_vm_close();
206
82b5ae8ceaf4 adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents: 202
diff changeset
619 #endif
4426
1ceadec3ea67 using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 4420
diff changeset
620
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
621 zoomFlag = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
622 vo_x11_uninit();
4677
305a0c20bde4 default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents: 4662
diff changeset
623
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
624 sws_freeContext(swsContext);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
625 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
626
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
627 static int preinit(const char *arg)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
628 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
629 if (arg)
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4734
diff changeset
630 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
631 mp_msg(MSGT_VO, MSGL_ERR, "vo_x11: Unknown subdevice: %s\n", arg);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
632 return ENOSYS;
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4734
diff changeset
633 }
5130
305b1fbde890 added directrendering support and better query_format
alex
parents: 4993
diff changeset
634
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
635 if (!vo_init())
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
636 return -1; // Can't open X11
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4734
diff changeset
637 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
638 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
639
33305
ddb45e9443ec Remove the variable arguments from the libvo control() functions.
iive
parents: 33301
diff changeset
640 static int control(uint32_t request, void *data)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
641 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
642 switch (request)
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7765
diff changeset
643 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
644 case VOCTRL_PAUSE:
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25962
diff changeset
645 return int_pause = 1;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
646 case VOCTRL_RESUME:
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25962
diff changeset
647 return int_pause = 0;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
648 case VOCTRL_QUERY_FORMAT:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
649 return query_format(*((uint32_t *) data));
27879
514afc9b920e Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents: 27762
diff changeset
650 case VOCTRL_GET_IMAGE:
514afc9b920e Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents: 27762
diff changeset
651 return get_image(data);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
652 case VOCTRL_GUISUPPORT:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
653 return VO_TRUE;
27879
514afc9b920e Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents: 27762
diff changeset
654 case VOCTRL_FULLSCREEN:
514afc9b920e Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents: 27762
diff changeset
655 vo_x11_fullscreen();
514afc9b920e Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents: 27762
diff changeset
656 vo_x11_clearwindow(mDisplay, vo_window);
514afc9b920e Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
reimar
parents: 27762
diff changeset
657 return VO_TRUE;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
658 case VOCTRL_SET_EQUALIZER:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
659 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32467
diff changeset
660 vf_equalizer_t *eq=data;
33326
a25fcd61e0c9 Fix vo_x11_set_equalizer argument, must be the raw value to set, not a pointer!
reimar
parents: 33325
diff changeset
661 return vo_x11_set_equalizer(eq->item, eq->value);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
662 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
663 case VOCTRL_GET_EQUALIZER:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
664 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32467
diff changeset
665 vf_equalizer_t *eq=data;
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32467
diff changeset
666 return vo_x11_get_equalizer(eq->item, &eq->value);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
667 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
668 case VOCTRL_ONTOP:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
669 vo_x11_ontop();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
670 return VO_TRUE;
22232
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 21599
diff changeset
671 case VOCTRL_UPDATE_SCREENINFO:
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 21599
diff changeset
672 update_xinerama_info();
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 21599
diff changeset
673 return VO_TRUE;
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7765
diff changeset
674 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11690
diff changeset
675 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4340
diff changeset
676 }