Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 21178:c9ac2772aa2e
Clean up CFLAGS handling.
author | diego |
---|---|
date | Fri, 24 Nov 2006 20:19:29 +0000 |
parents | 27aa9329d4f7 |
children | 3ddf91e141a3 |
rev | line source |
---|---|
1 | 1 |
2 #include <stdio.h> | |
3 #include <stdlib.h> | |
4 #include <string.h> | |
5 #include <signal.h> | |
6 | |
7 #include "config.h" | |
8 #include "video_out.h" | |
9 #include "video_out_internal.h" | |
10 | |
11 | |
12 #include <X11/Xlib.h> | |
13 #include <X11/Xutil.h> | |
4036 | 14 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
15 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
16 #include <X11/extensions/xf86vmode.h> |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
17 #endif |
1 | 18 #include <errno.h> |
19 | |
31 | 20 #include "x11_common.h" |
21 | |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
22 #ifdef HAVE_SHM |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
23 #include <sys/ipc.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
24 #include <sys/shm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
25 #include <X11/extensions/XShm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
26 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
27 static int Shmem_Flag; |
12582 | 28 |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
29 //static int Quiet_Flag; Here also what is this for. It's used but isn't inited ? |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
30 static XShmSegmentInfo Shminfo[1]; |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
31 static int gXErrorFlag; |
12582 | 32 static int CompletionType = -1; |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
33 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
34 /* since it doesn't seem to be defined on some platforms */ |
12582 | 35 int XShmGetEventBase(Display *); |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
36 #endif |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
37 |
354 | 38 #include "fastmemcpy.h" |
616 | 39 #include "sub.h" |
350 | 40 |
18861 | 41 #include "libswscale/swscale.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
42 #include "libmpcodecs/vf_scale.h" |
18746 | 43 #define MODE_RGB 0x1 |
44 #define MODE_BGR 0x2 | |
2218 | 45 |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
46 #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
|
47 #include "help_mp.h" |
4734 | 48 |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
49 #ifdef HAVE_NEW_GUI |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
50 #include "Gui/interface.h" |
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
51 #include "mplayer.h" |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
52 #endif |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
53 |
12582 | 54 static vo_info_t info = { |
55 "X11 ( XImage/Shm )", | |
56 "x11", | |
57 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>", | |
58 "" | |
1 | 59 }; |
60 | |
12582 | 61 LIBVO_EXTERN(x11) |
1 | 62 /* private prototypes */ |
12582 | 63 static void Display_Image(XImage * myximage, unsigned char *ImageData); |
64 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h, | |
65 unsigned char *src, unsigned char *srca, | |
66 int stride); | |
1 | 67 |
68 /* local data */ | |
69 static unsigned char *ImageData; | |
70 | |
71 /* X11 related variables */ | |
7764 | 72 static XImage *myximage = NULL; |
12582 | 73 static int depth, bpp, mode; |
1 | 74 static XWindowAttributes attribs; |
75 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
76 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
|
77 |
2969 | 78 static int Flip_Flag; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
79 static int zoomFlag; |
2969 | 80 |
1 | 81 |
82 static uint32_t image_width; | |
83 static uint32_t image_height; | |
4641 | 84 static uint32_t in_format; |
12582 | 85 static uint32_t out_format = 0; |
86 static int srcW = -1; | |
87 static int srcH = -1; | |
88 static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing | |
1 | 89 |
12582 | 90 static int old_vo_dwidth = -1; |
91 static int old_vo_dheight = -1; | |
92 | |
93 static void check_events() | |
94 { | |
95 int ret = vo_x11_check_events(mDisplay); | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
96 |
12582 | 97 /* clear left over borders and redraw frame if we are paused */ |
98 if (ret & VO_EVENT_EXPOSE && int_pause) | |
99 { | |
100 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, | |
101 myximage->height, 0); | |
102 flip_page(); | |
103 } else if ((ret & VO_EVENT_RESIZE) || (ret & VO_EVENT_EXPOSE)) | |
104 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, | |
105 myximage->height, 0); | |
106 | |
107 } | |
108 | |
109 static void draw_alpha_32(int x0, int y0, int w, int h, unsigned char *src, | |
110 unsigned char *srca, int stride) | |
111 { | |
112 vo_draw_alpha_rgb32(w, h, src, srca, stride, | |
113 ImageData + 4 * (y0 * image_width + x0), | |
114 4 * image_width); | |
1 | 115 } |
116 | |
12582 | 117 static void draw_alpha_24(int x0, int y0, int w, int h, unsigned char *src, |
118 unsigned char *srca, int stride) | |
119 { | |
120 vo_draw_alpha_rgb24(w, h, src, srca, stride, | |
121 ImageData + 3 * (y0 * image_width + x0), | |
122 3 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
123 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
124 |
12582 | 125 static void draw_alpha_16(int x0, int y0, int w, int h, unsigned char *src, |
126 unsigned char *srca, int stride) | |
127 { | |
128 vo_draw_alpha_rgb16(w, h, src, srca, stride, | |
129 ImageData + 2 * (y0 * image_width + x0), | |
130 2 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
131 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
132 |
12582 | 133 static void draw_alpha_15(int x0, int y0, int w, int h, unsigned char *src, |
134 unsigned char *srca, int stride) | |
135 { | |
136 vo_draw_alpha_rgb15(w, h, src, srca, stride, | |
137 ImageData + 2 * (y0 * image_width + x0), | |
138 2 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
139 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
140 |
12582 | 141 static void draw_alpha_null(int x0, int y0, int w, int h, |
142 unsigned char *src, unsigned char *srca, | |
143 int stride) | |
144 { | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
145 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
146 |
18746 | 147 static struct SwsContext *swsContext = NULL; |
148 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
|
149 extern int sws_flags; |
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
|
150 |
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
|
151 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
|
152 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16171
diff
changeset
|
153 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
|
154 { |
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 #ifdef HAVE_SHM |
12582 | 156 if (mLocalDisplay && XShmQueryExtension(mDisplay)) |
157 Shmem_Flag = 1; | |
158 else | |
159 { | |
160 Shmem_Flag = 0; | |
161 mp_msg(MSGT_VO, MSGL_WARN, | |
162 "Shared memory not supported\nReverting to normal Xlib\n"); | |
163 } | |
164 if (Shmem_Flag) | |
165 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
|
166 |
12582 | 167 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
|
168 { |
12582 | 169 myximage = |
170 XShmCreateImage(mDisplay, vinfo.visual, depth, ZPixmap, NULL, | |
171 &Shminfo[0], image_width, image_height); | |
172 if (myximage == NULL) | |
173 { | |
174 mp_msg(MSGT_VO, MSGL_WARN, | |
175 "Shared memory error,disabling ( Ximage error )\n"); | |
176 goto shmemerror; | |
177 } | |
178 Shminfo[0].shmid = shmget(IPC_PRIVATE, | |
179 myximage->bytes_per_line * | |
180 myximage->height, IPC_CREAT | 0777); | |
181 if (Shminfo[0].shmid < 0) | |
182 { | |
183 XDestroyImage(myximage); | |
184 mp_msg(MSGT_VO, MSGL_V, "%s\n", strerror(errno)); | |
185 //perror( strerror( errno ) ); | |
186 mp_msg(MSGT_VO, MSGL_WARN, | |
187 "Shared memory error,disabling ( seg id error )\n"); | |
188 goto shmemerror; | |
189 } | |
190 Shminfo[0].shmaddr = (char *) shmat(Shminfo[0].shmid, 0, 0); | |
3209 | 191 |
12582 | 192 if (Shminfo[0].shmaddr == ((char *) -1)) |
193 { | |
194 XDestroyImage(myximage); | |
195 if (Shminfo[0].shmaddr != ((char *) -1)) | |
196 shmdt(Shminfo[0].shmaddr); | |
197 mp_msg(MSGT_VO, MSGL_WARN, | |
198 "Shared memory error,disabling ( address error )\n"); | |
199 goto shmemerror; | |
200 } | |
201 myximage->data = Shminfo[0].shmaddr; | |
202 ImageData = (unsigned char *) myximage->data; | |
203 Shminfo[0].readOnly = False; | |
204 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
|
205 |
12582 | 206 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
|
207 |
12582 | 208 if (gXErrorFlag) |
209 { | |
210 XDestroyImage(myximage); | |
211 shmdt(Shminfo[0].shmaddr); | |
212 mp_msg(MSGT_VO, MSGL_WARN, "Shared memory error,disabling.\n"); | |
213 gXErrorFlag = 0; | |
214 goto shmemerror; | |
215 } else | |
216 shmctl(Shminfo[0].shmid, IPC_RMID, 0); | |
217 | |
218 { | |
219 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
|
220 |
12582 | 221 if (firstTime) |
222 { | |
223 mp_msg(MSGT_VO, MSGL_V, "Sharing memory.\n"); | |
224 firstTime = 0; | |
225 } | |
226 } | |
227 } else | |
228 { | |
229 shmemerror: | |
230 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
|
231 #endif |
12582 | 232 myximage = XGetImage(mDisplay, vo_window, 0, 0, |
233 image_width, image_height, AllPlanes, | |
234 ZPixmap); | |
235 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
|
236 #ifdef HAVE_SHM |
12582 | 237 } |
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
|
238 #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
|
239 } |
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
|
240 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16171
diff
changeset
|
241 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
|
242 { |
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 #ifdef HAVE_SHM |
12582 | 244 if (Shmem_Flag) |
245 { | |
246 XShmDetach(mDisplay, &Shminfo[0]); | |
247 XDestroyImage(myximage); | |
248 shmdt(Shminfo[0].shmaddr); | |
249 } 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
|
250 #endif |
12582 | 251 { |
252 XDestroyImage(myximage); | |
253 } | |
254 myximage = 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
|
255 } |
2218 | 256 |
20399
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
257 #ifdef WORDS_BIGENDIAN |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
258 #define BO_NATIVE MSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
259 #define BO_NONNATIVE LSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
260 #else |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
261 #define BO_NATIVE LSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
262 #define BO_NONNATIVE MSBFirst |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
263 #endif |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
264 struct fmt2Xfmtentry_s { |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
265 uint32_t mpfmt; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
266 int byte_order; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
267 unsigned red_mask; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
268 unsigned green_mask; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
269 unsigned blue_mask; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
270 } fmt2Xfmt[] = { |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
271 {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
|
272 {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
|
273 {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
|
274 {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
|
275 {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
|
276 {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
|
277 {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
|
278 {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
|
279 {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
|
280 {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
|
281 {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
|
282 {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
|
283 {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
|
284 {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
|
285 {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
|
286 {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
|
287 {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
|
288 {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
|
289 {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
|
290 {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
|
291 {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
|
292 {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
|
293 {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
|
294 {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
|
295 {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
|
296 }; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
297 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
298 static int config(uint32_t width, uint32_t height, uint32_t d_width, |
12582 | 299 uint32_t d_height, uint32_t flags, char *title, |
300 uint32_t format) | |
1 | 301 { |
1110 | 302 // int screen; |
12582 | 303 int fullscreen = 0; |
304 int vm = 0; | |
305 | |
1110 | 306 // int interval, prefer_blank, allow_exp, nothing; |
12582 | 307 unsigned int fg, bg; |
308 XEvent xev; | |
309 XGCValues xgcv; | |
310 Colormap theCmap; | |
311 XSetWindowAttributes xswa; | |
312 unsigned long xswamask; | |
20399
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
313 struct fmt2Xfmtentry_s *fmte = fmt2Xfmt; |
12582 | 314 |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
315 #ifdef HAVE_XF86VM |
12582 | 316 unsigned int modeline_width, modeline_height; |
317 static uint32_t vm_width; | |
318 static uint32_t vm_height; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
319 #endif |
1 | 320 |
12582 | 321 vo_mouse_autohide = 1; |
322 old_vo_dwidth = -1; | |
323 old_vo_dheight = -1; | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
324 |
12582 | 325 if (!title) |
17787 | 326 title = "MPlayer X11 (XImage/Shm) render"; |
4813 | 327 |
12582 | 328 in_format = format; |
329 srcW = width; | |
330 srcH = height; | |
18116 | 331 update_xinerama_info(); |
12582 | 332 vo_dx = (vo_screenwidth - d_width) / 2; |
333 vo_dy = (vo_screenheight - d_height) / 2; | |
334 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, | |
335 vo_screenheight); | |
18116 | 336 vo_dx += xinerama_x; |
337 vo_dy += xinerama_y; | |
12582 | 338 vo_dwidth = d_width; |
339 vo_dheight = d_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
|
340 |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
341 if (flags & (VOFLAG_FULLSCREEN|VOFLAG_MODESWITCHING)) |
12582 | 342 fullscreen = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
343 if (flags & VOFLAG_MODESWITCHING) |
12582 | 344 vm = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
345 if (flags & VOFLAG_FLIPPING) |
12582 | 346 Flip_Flag = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
347 zoomFlag = flags & VOFLAG_SWSCALE; |
12582 | 348 |
349 int_pause = 0; | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
350 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode |
12582 | 351 |
2218 | 352 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight ); |
1746 | 353 |
12582 | 354 XGetWindowAttributes(mDisplay, mRootWin, &attribs); |
355 depth = attribs.depth; | |
356 | |
357 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) | |
358 { | |
359 Visual *visual; | |
1746 | 360 |
12582 | 361 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); |
362 } | |
363 if (!XMatchVisualInfo(mDisplay, mScreen, depth, DirectColor, &vinfo) || | |
364 (WinID > 0 | |
365 && vinfo.visualid != XVisualIDFromVisual(attribs.visual))) | |
366 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); | |
1746 | 367 |
12582 | 368 /* set image size (which is indeed neither the input nor output size), |
369 if zoom is on it will be changed during draw_slice anyway so we don't duplicate the aspect code here | |
370 */ | |
371 image_width = (width + 7) & (~7); | |
372 image_height = height; | |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
373 |
12582 | 374 aspect = ((1 << 16) * d_width + d_height / 2) / d_height; |
2218 | 375 |
1752 | 376 #ifdef HAVE_NEW_GUI |
12582 | 377 if (use_gui) |
378 guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window | |
379 else | |
380 #endif | |
381 { | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
382 #ifdef HAVE_XF86VM |
12582 | 383 if (vm) |
384 { | |
385 if ((d_width == 0) && (d_height == 0)) | |
386 { | |
387 vm_width = image_width; | |
388 vm_height = image_height; | |
389 } else | |
390 { | |
391 vm_width = d_width; | |
392 vm_height = d_height; | |
393 } | |
394 vo_vm_switch(vm_width, vm_height, &modeline_width, | |
395 &modeline_height); | |
396 vo_dx = (vo_screenwidth - modeline_width) / 2; | |
397 vo_dy = (vo_screenheight - modeline_height) / 2; | |
398 vo_dwidth = modeline_width; | |
399 vo_dheight = modeline_height; | |
400 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
401 #endif |
12582 | 402 bg = WhitePixel(mDisplay, mScreen); |
403 fg = BlackPixel(mDisplay, mScreen); | |
1 | 404 |
12582 | 405 theCmap = vo_x11_create_colormap(&vinfo); |
1 | 406 |
12582 | 407 xswa.background_pixel = 0; |
408 xswa.border_pixel = 0; | |
409 xswa.colormap = theCmap; | |
410 xswamask = CWBackPixel | CWBorderPixel | CWColormap; | |
1 | 411 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
412 #ifdef HAVE_XF86VM |
12582 | 413 if (vm) |
414 { | |
415 xswa.override_redirect = True; | |
416 xswamask |= CWOverrideRedirect; | |
417 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
418 #endif |
12582 | 419 |
420 if (WinID >= 0) | |
421 { | |
422 vo_window = WinID ? ((Window) WinID) : mRootWin; | |
423 if (WinID) | |
424 { | |
15540 | 425 int border; |
12582 | 426 XUnmapWindow(mDisplay, vo_window); |
427 XChangeWindowAttributes(mDisplay, vo_window, xswamask, | |
428 &xswa); | |
429 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
430 StructureNotifyMask | | |
431 KeyPressMask | | |
432 PropertyChangeMask | | |
433 PointerMotionMask | | |
434 ButtonPressMask | | |
435 ButtonReleaseMask | | |
436 ExposureMask); | |
437 XMapWindow(mDisplay, vo_window); | |
15540 | 438 XGetGeometry(mDisplay, vo_window, &mRootWin, |
439 &vo_dx, &vo_dy, &vo_dwidth, &vo_dheight, | |
440 &border, &depth); | |
12582 | 441 } else |
442 XSelectInput(mDisplay, vo_window, ExposureMask); | |
443 } else | |
444 { | |
445 if (vo_window == None) | |
446 { | |
447 vo_window = | |
448 vo_x11_create_smooth_window(mDisplay, mRootWin, | |
449 vinfo.visual, vo_dx, vo_dy, | |
450 vo_dwidth, vo_dheight, | |
451 depth, theCmap); | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
452 |
12582 | 453 vo_x11_classhint(mDisplay, vo_window, "x11"); |
454 vo_hidecursor(mDisplay, vo_window); | |
455 vo_x11_sizehint(vo_dx, vo_dy, vo_dwidth, vo_dheight, 0); | |
456 XSelectInput(mDisplay, vo_window, StructureNotifyMask); | |
457 XStoreName(mDisplay, vo_window, title); | |
458 XMapWindow(mDisplay, vo_window); | |
7764 | 459 // if(WinID!=0) |
12582 | 460 do |
461 { | |
462 XNextEvent(mDisplay, &xev); | |
463 } | |
464 while (xev.type != MapNotify | |
465 || xev.xmap.event != vo_window); | |
466 | |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18234
diff
changeset
|
467 vo_x11_nofs_sizepos(vo_dx, vo_dy, vo_dwidth, vo_dheight); |
12582 | 468 if (fullscreen) |
469 vo_x11_fullscreen(); | |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18234
diff
changeset
|
470 } else |
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18234
diff
changeset
|
471 vo_x11_nofs_sizepos(vo_dx, vo_dy, vo_dwidth, vo_dheight); |
12582 | 472 } |
6043 | 473 |
12582 | 474 XSync(mDisplay, False); |
1 | 475 |
12582 | 476 // we cannot grab mouse events on root window :( |
477 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
478 StructureNotifyMask | KeyPressMask | | |
479 PropertyChangeMask | ExposureMask | | |
480 ((WinID == | |
481 0) ? 0 : (ButtonPressMask | | |
482 ButtonReleaseMask | | |
483 PointerMotionMask))); | |
4805 | 484 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
485 #ifdef HAVE_XF86VM |
12582 | 486 if (vm) |
487 { | |
488 /* Grab the mouse pointer in our window */ | |
489 if (vo_grabpointer) | |
490 XGrabPointer(mDisplay, vo_window, True, 0, | |
491 GrabModeAsync, GrabModeAsync, | |
492 vo_window, None, CurrentTime); | |
493 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
494 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
495 #endif |
12582 | 496 } |
1 | 497 |
12582 | 498 if (vo_gc != None) |
499 XFreeGC(mDisplay, vo_gc); | |
500 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | |
501 | |
502 if (myximage) | |
503 { | |
504 freeMyXImage(); | |
505 sws_freeContext(swsContext); | |
506 } | |
507 getMyXImage(); | |
508 | |
509 if (!WinID) | |
510 { | |
511 vo_dwidth = vo_screenwidth; | |
512 vo_dheight = vo_screenheight; | |
513 } | |
1 | 514 |
20399
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
515 while (fmte->mpfmt) { |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
516 if (IMGFMT_RGB_DEPTH(fmte->mpfmt) == myximage->bits_per_pixel && |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
517 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
|
518 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
|
519 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
|
520 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
|
521 break; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
522 fmte++; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
523 } |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
524 if (!fmte->mpfmt) { |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
525 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
|
526 "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
|
527 return -1; |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
528 } |
27aa9329d4f7
Proper detection of corresponding MPlayer image format for X server format for vo_x11.
reimar
parents:
20196
diff
changeset
|
529 out_format = fmte->mpfmt; |
12582 | 530 switch ((bpp = myximage->bits_per_pixel)) |
531 { | |
532 case 24: | |
533 draw_alpha_fnc = draw_alpha_24; | |
534 break; | |
535 case 32: | |
536 draw_alpha_fnc = draw_alpha_32; | |
537 break; | |
538 case 15: | |
539 case 16: | |
540 if (depth == 15) | |
541 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
|
542 else |
12582 | 543 draw_alpha_fnc = draw_alpha_16; |
544 break; | |
545 default: | |
546 draw_alpha_fnc = draw_alpha_null; | |
547 } | |
1 | 548 |
12582 | 549 /* always allocate swsContext as size could change between frames */ |
550 swsContext = | |
551 sws_getContextFromCmdLine(width, height, in_format, width, height, | |
552 out_format); | |
553 if (!swsContext) | |
554 return -1; | |
1 | 555 |
18746 | 556 dst_width = width; |
12582 | 557 //printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 558 |
12582 | 559 if (vo_ontop) |
560 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 561 |
12582 | 562 return 0; |
1 | 563 } |
564 | |
12582 | 565 static void Display_Image(XImage * myximage, uint8_t * ImageData) |
1 | 566 { |
3003 | 567 #ifdef HAVE_SHM |
12582 | 568 if (Shmem_Flag) |
569 { | |
570 XShmPutImage(mDisplay, vo_window, vo_gc, myximage, | |
571 0, 0, | |
18746 | 572 (vo_dwidth - dst_width) / 2, |
573 (vo_dheight - myximage->height) / 2, dst_width, | |
12582 | 574 myximage->height, True); |
575 } else | |
1 | 576 #endif |
12582 | 577 { |
578 XPutImage(mDisplay, vo_window, vo_gc, myximage, | |
579 0, 0, | |
18746 | 580 (vo_dwidth - dst_width) / 2, |
581 (vo_dheight - myximage->height) / 2, dst_width, | |
12582 | 582 myximage->height); |
583 } | |
1 | 584 } |
585 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
586 static void draw_osd(void) |
12582 | 587 { |
588 vo_draw_text(image_width, image_height, draw_alpha_fnc); | |
589 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
590 |
12582 | 591 static void flip_page(void) |
592 { | |
593 Display_Image(myximage, ImageData); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
594 XSync(mDisplay, False); |
31 | 595 } |
1 | 596 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
597 static int draw_slice(uint8_t * src[], int stride[], int w, int h, |
12582 | 598 int x, int y) |
1 | 599 { |
12582 | 600 uint8_t *dst[3]; |
601 int dstStride[3]; | |
6059 | 602 |
12582 | 603 if ((old_vo_dwidth != vo_dwidth |
604 || old_vo_dheight != vo_dheight) /*&& y==0 */ && zoomFlag) | |
605 { | |
606 int newW = vo_dwidth; | |
607 int newH = vo_dheight; | |
608 int newAspect = (newW * (1 << 16) + (newH >> 1)) / newH; | |
18746 | 609 struct SwsContext *oldContext = swsContext; |
4641 | 610 |
12582 | 611 if (newAspect > aspect) |
612 newW = (newH * aspect + (1 << 15)) >> 16; | |
613 else | |
614 newH = ((newW << 16) + (aspect >> 1)) / aspect; | |
4641 | 615 |
12582 | 616 old_vo_dwidth = vo_dwidth; |
617 old_vo_dheight = vo_dheight; | |
618 | |
619 if (sws_flags == 0) | |
620 newW &= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed | |
4627 | 621 |
12582 | 622 swsContext = sws_getContextFromCmdLine(srcW, srcH, in_format, |
623 newW, newH, out_format); | |
624 if (swsContext) | |
625 { | |
626 image_width = (newW + 7) & (~7); | |
627 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
|
628 |
12582 | 629 freeMyXImage(); |
630 getMyXImage(); | |
631 sws_freeContext(oldContext); | |
632 } else | |
633 { | |
634 swsContext = oldContext; | |
635 } | |
18746 | 636 dst_width = newW; |
12582 | 637 } |
638 dstStride[1] = dstStride[2] = 0; | |
639 dst[1] = dst[2] = NULL; | |
640 | |
641 if (Flip_Flag) | |
642 { | |
643 dstStride[0] = -image_width * ((bpp + 7) / 8); | |
644 dst[0] = ImageData - dstStride[0] * (image_height - 1); | |
645 sws_scale_ordered(swsContext, src, stride, y, h, dst, dstStride); | |
646 } else | |
647 { | |
648 dstStride[0] = image_width * ((bpp + 7) / 8); | |
649 dst[0] = ImageData; | |
650 sws_scale_ordered(swsContext, src, stride, y, h, dst, dstStride); | |
651 } | |
652 return 0; | |
1 | 653 } |
654 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
655 static int draw_frame(uint8_t * src[]) |
12582 | 656 { |
7683 | 657 #if 0 |
12582 | 658 int stride[3] = { 0, 0, 0 }; |
659 | |
660 if (in_format == IMGFMT_YUY2) | |
661 stride[0] = srcW * 2; | |
662 else if (in_format == IMGFMT_BGR8) | |
663 stride[0] = srcW; | |
664 else if (in_format == IMGFMT_BGR15) | |
665 stride[0] = srcW * 2; | |
666 else if (in_format == IMGFMT_BGR16) | |
667 stride[0] = srcW * 2; | |
668 else if (in_format == IMGFMT_BGR24) | |
669 stride[0] = srcW * 3; | |
670 else if (in_format == IMGFMT_BGR32) | |
671 stride[0] = srcW * 4; | |
672 | |
673 return draw_slice(src, stride, srcW, srcH, 0, 0); | |
7683 | 674 #else |
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
|
675 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_X11_DrawFrameCalled); |
7683 | 676 return -1; |
677 #endif | |
678 } | |
679 | |
12582 | 680 static uint32_t get_image(mp_image_t * mpi) |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
681 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
682 if (zoomFlag || |
12582 | 683 !IMGFMT_IS_BGR(mpi->imgfmt) || |
684 (IMGFMT_BGR_DEPTH(mpi->imgfmt) != vo_depthonscreen) || | |
685 ((mpi->type != MP_IMGTYPE_STATIC) | |
686 && (mpi->type != MP_IMGTYPE_TEMP)) | |
687 || (mpi->flags & MP_IMGFLAG_PLANAR) | |
688 || (mpi->flags & MP_IMGFLAG_YUV) || (mpi->width != image_width) | |
689 || (mpi->height != image_height)) | |
690 return (VO_FALSE); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
691 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
692 if (Flip_Flag) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
693 { |
12582 | 694 mpi->stride[0] = -image_width * ((bpp + 7) / 8); |
695 mpi->planes[0] = ImageData - mpi->stride[0] * (image_height - 1); | |
696 } else | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
697 { |
12582 | 698 mpi->stride[0] = image_width * ((bpp + 7) / 8); |
699 mpi->planes[0] = ImageData; | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
700 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
701 mpi->flags |= MP_IMGFLAG_DIRECT; |
12582 | 702 |
703 return (VO_TRUE); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
704 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
705 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
706 static int query_format(uint32_t format) |
1 | 707 { |
12582 | 708 mp_msg(MSGT_VO, MSGL_DBG2, |
709 "vo_x11: query_format was called: %x (%s)\n", format, | |
710 vo_format_name(format)); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
711 if (IMGFMT_IS_BGR(format)) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
712 { |
12582 | 713 if (IMGFMT_BGR_DEPTH(format) <= 8) |
714 return 0; // TODO 8bpp not yet fully implemented | |
715 if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen) | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
716 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 717 VFCAP_ACCEPT_STRIDE; |
718 else | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
719 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 720 VFCAP_ACCEPT_STRIDE; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
721 } |
325 | 722 |
12582 | 723 switch (format) |
724 { | |
6692
ad521fb49a5e
-vm -fs -zoom fix, set correct vm screenres in aspect code (similar to xv fix).
atmos4
parents:
6180
diff
changeset
|
725 // case IMGFMT_BGR8: |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
726 // case IMGFMT_BGR15: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
727 // case IMGFMT_BGR16: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
728 // case IMGFMT_BGR24: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
729 // case IMGFMT_BGR32: |
6694
9291268a3603
1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents:
6693
diff
changeset
|
730 // return 0x2; |
4905
eb1a28f1236a
yuy2 support disabled to workaround stupid colorspace selection
michael
parents:
4889
diff
changeset
|
731 // case IMGFMT_YUY2: |
12582 | 732 case IMGFMT_I420: |
733 case IMGFMT_IYUV: | |
734 case IMGFMT_YV12: | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
735 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; |
12582 | 736 } |
737 return 0; | |
1 | 738 } |
739 | |
740 | |
7683 | 741 static void uninit(void) |
1 | 742 { |
12582 | 743 if (!myximage) |
744 return; | |
745 | |
746 freeMyXImage(); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
747 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
748 #ifdef HAVE_XF86VM |
12582 | 749 vo_vm_close(mDisplay); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
750 #endif |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
751 |
12582 | 752 zoomFlag = 0; |
753 vo_x11_uninit(); | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
754 |
12582 | 755 sws_freeContext(swsContext); |
1 | 756 } |
757 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
758 static int preinit(const char *arg) |
4352 | 759 { |
12582 | 760 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
|
761 { |
12582 | 762 mp_msg(MSGT_VO, MSGL_ERR, "vo_x11: Unknown subdevice: %s\n", arg); |
763 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
|
764 } |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
765 |
12582 | 766 if (!vo_init()) |
767 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
|
768 return 0; |
4352 | 769 } |
1 | 770 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
771 static int control(uint32_t request, void *data, ...) |
4352 | 772 { |
12582 | 773 switch (request) |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
774 { |
12582 | 775 case VOCTRL_PAUSE: |
776 return (int_pause = 1); | |
777 case VOCTRL_RESUME: | |
778 return (int_pause = 0); | |
779 case VOCTRL_QUERY_FORMAT: | |
780 return query_format(*((uint32_t *) data)); | |
781 case VOCTRL_GUISUPPORT: | |
782 return VO_TRUE; | |
783 case VOCTRL_GET_IMAGE: | |
784 return get_image(data); | |
785 case VOCTRL_SET_EQUALIZER: | |
786 { | |
787 va_list ap; | |
788 int value; | |
789 | |
790 va_start(ap, data); | |
791 value = va_arg(ap, int); | |
792 | |
793 va_end(ap); | |
794 return vo_x11_set_equalizer(data, value); | |
795 } | |
796 case VOCTRL_GET_EQUALIZER: | |
797 { | |
798 va_list ap; | |
799 int *value; | |
800 | |
801 va_start(ap, data); | |
802 value = va_arg(ap, int *); | |
803 | |
804 va_end(ap); | |
805 return vo_x11_get_equalizer(data, value); | |
806 } | |
807 case VOCTRL_ONTOP: | |
808 vo_x11_ontop(); | |
809 return VO_TRUE; | |
810 case VOCTRL_FULLSCREEN: | |
811 { | |
812 vo_x11_fullscreen(); | |
813 vo_x11_clearwindow(mDisplay, vo_window); | |
814 } | |
815 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
816 } |
12582 | 817 return VO_NOTIMPL; |
4352 | 818 } |