Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 28399:28406057a982
Convert HAVE_CLOSESOCKET and HAVE_SOCKLEN_T into 0/1 definitions.
author | diego |
---|---|
date | Sun, 01 Feb 2009 13:16:46 +0000 |
parents | a4aa7ecd8cbe |
children | 7681eab10aea |
rev | line source |
---|---|
7757 | 1 /* vo_xv.c, X11 Xv interface */ |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
2 |
1265 | 3 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_ |
4 // Use option -double to enable double buffering! (default: single buffer) | |
6758
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
5 #define NUM_BUFFERS 3 |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
6 |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
7 /* |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
8 Buffer allocation: |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
9 |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
10 -nodr: |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
11 1: TEMP |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
12 2: 2*TEMP |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
13 |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
14 -dr: |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
15 1: TEMP |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
16 3: 2*STATIC+TEMP |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
17 */ |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
18 |
1 | 19 #include <stdio.h> |
20 #include <stdlib.h> | |
21 #include <string.h> | |
22 | |
23 #include "config.h" | |
5935 | 24 #include "mp_msg.h" |
16958 | 25 #include "help_mp.h" |
1 | 26 #include "video_out.h" |
27 #include "video_out_internal.h" | |
28 | |
29 | |
30 #include <X11/Xlib.h> | |
31 #include <X11/Xutil.h> | |
32 #include <errno.h> | |
33 | |
31 | 34 #include "x11_common.h" |
35 | |
354 | 36 #include "fastmemcpy.h" |
616 | 37 #include "sub.h" |
2054 | 38 #include "aspect.h" |
350 | 39 |
14742 | 40 #include "subopt-helper.h" |
41 | |
24133 | 42 #include "input/input.h" |
43 | |
27343 | 44 #ifdef CONFIG_GUI |
23077 | 45 #include "gui/interface.h" |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
46 #endif |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
47 |
25963 | 48 #include "libavutil/common.h" |
22461
c54ad95f852a
Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents:
22232
diff
changeset
|
49 |
25216 | 50 static const vo_info_t info = { |
12582 | 51 "X11/Xv", |
52 "xv", | |
53 "Gerd Knorr <kraxel@goldbach.in-berlin.de> and others", | |
54 "" | |
1 | 55 }; |
56 | |
25220
c9e9ac2008c2
Mark the vo_functions_t definitions as const where possible.
reimar
parents:
25216
diff
changeset
|
57 const LIBVO_EXTERN(xv) |
6719
5291d74a60c9
xv support under cygwin - patch by Sycotic Smith <sycotic at linuxmail.org>
alex
parents:
6417
diff
changeset
|
58 #ifdef HAVE_SHM |
1 | 59 #include <sys/ipc.h> |
60 #include <sys/shm.h> | |
61 #include <X11/extensions/XShm.h> | |
6416 | 62 |
63 static XShmSegmentInfo Shminfo[NUM_BUFFERS]; | |
6417
44bca09c1edd
100l accidently removed a line too much (Shmem_Flag)
atmos4
parents:
6416
diff
changeset
|
64 static int Shmem_Flag; |
6416 | 65 #endif |
66 | |
10855 | 67 // Note: depends on the inclusion of X11/extensions/XShm.h |
68 #include <X11/extensions/Xv.h> | |
69 #include <X11/extensions/Xvlib.h> | |
70 | |
71 // FIXME: dynamically allocate this stuff | |
72 static void allocate_xvimage(int); | |
12582 | 73 static unsigned int ver, rel, req, ev, err; |
14742 | 74 static unsigned int formats, adaptors, xv_format; |
12582 | 75 static XvAdaptorInfo *ai = NULL; |
13953 | 76 static XvImageFormatValues *fo=NULL; |
10855 | 77 |
12582 | 78 static int current_buf = 0; |
79 static int current_ip_buf = 0; | |
80 static int num_buffers = 1; // default | |
14782 | 81 static int visible_buf = -1; // -1 means: no buffer was drawn yet |
12582 | 82 static XvImage *xvimage[NUM_BUFFERS]; |
10855 | 83 |
84 | |
1 | 85 static uint32_t image_width; |
86 static uint32_t image_height; | |
87 static uint32_t image_format; | |
88 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10359
diff
changeset
|
89 static int int_pause; |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10359
diff
changeset
|
90 |
27892 | 91 static uint32_t drwX, drwY; |
16958 | 92 static uint32_t max_width = 0, max_height = 0; // zero means: not set |
1 | 93 |
12582 | 94 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h, |
95 unsigned char *src, unsigned char *srca, | |
96 int stride); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
97 |
12582 | 98 static void draw_alpha_yv12(int x0, int y0, int w, int h, |
99 unsigned char *src, unsigned char *srca, | |
100 int stride) | |
101 { | |
102 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); | |
103 vo_draw_alpha_yv12(w, h, src, srca, stride, | |
104 xvimage[current_buf]->data + | |
105 xvimage[current_buf]->offsets[0] + | |
106 xvimage[current_buf]->pitches[0] * y0 + x0, | |
107 xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
108 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
109 |
12582 | 110 static void draw_alpha_yuy2(int x0, int y0, int w, int h, |
111 unsigned char *src, unsigned char *srca, | |
112 int stride) | |
113 { | |
114 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); | |
115 vo_draw_alpha_yuy2(w, h, src, srca, stride, | |
116 xvimage[current_buf]->data + | |
117 xvimage[current_buf]->offsets[0] + | |
118 xvimage[current_buf]->pitches[0] * y0 + 2 * x0, | |
119 xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
120 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
121 |
12582 | 122 static void draw_alpha_uyvy(int x0, int y0, int w, int h, |
123 unsigned char *src, unsigned char *srca, | |
124 int stride) | |
125 { | |
126 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); | |
127 vo_draw_alpha_yuy2(w, h, src, srca, stride, | |
128 xvimage[current_buf]->data + | |
129 xvimage[current_buf]->offsets[0] + | |
130 xvimage[current_buf]->pitches[0] * y0 + 2 * x0 + 1, | |
131 xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
132 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
133 |
12582 | 134 static void draw_alpha_null(int x0, int y0, int w, int h, |
135 unsigned char *src, unsigned char *srca, | |
136 int stride) | |
137 { | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
138 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
139 |
6786 | 140 |
7757 | 141 static void deallocate_xvimage(int foo); |
142 | |
182 | 143 /* |
144 * connect to server, create and map window, | |
1 | 145 * allocate colors and (shared) memory |
146 */ | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
147 static int config(uint32_t width, uint32_t height, uint32_t d_width, |
12582 | 148 uint32_t d_height, uint32_t flags, char *title, |
149 uint32_t format) | |
1 | 150 { |
12582 | 151 XVisualInfo vinfo; |
152 XSetWindowAttributes xswa; | |
153 XWindowAttributes attribs; | |
154 unsigned long xswamask; | |
155 int depth; | |
156 | |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
157 #ifdef CONFIG_XF86VM |
27952
94bab93a8d17
Simplify handling of VOFLAG_MODESWITCHNG, merge assignment and declaration
reimar
parents:
27951
diff
changeset
|
158 int vm = flags & VOFLAG_MODESWITCHING; |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
159 #endif |
1 | 160 |
12582 | 161 image_height = height; |
162 image_width = width; | |
163 image_format = format; | |
2249
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2055
diff
changeset
|
164 |
16958 | 165 if ((max_width != 0 && max_height != 0) && |
166 (image_width > max_width || image_height > max_height)) | |
167 { | |
20765 | 168 mp_msg( MSGT_VO, MSGL_ERR, MSGTR_VO_XV_ImagedimTooHigh, |
16958 | 169 image_width, image_height, max_width, max_height); |
170 return -1; | |
171 } | |
172 | |
12582 | 173 int_pause = 0; |
14782 | 174 visible_buf = -1; |
1 | 175 |
12582 | 176 num_buffers = |
177 vo_doublebuffering ? (vo_directrendering ? NUM_BUFFERS : 2) : 1; | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
178 |
12582 | 179 /* check image formats */ |
180 { | |
181 unsigned int i; | |
10855 | 182 |
12582 | 183 xv_format = 0; |
184 for (i = 0; i < formats; i++) | |
185 { | |
186 mp_msg(MSGT_VO, MSGL_V, | |
187 "Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id, | |
188 (char *) &fo[i].id, | |
189 (fo[i].format == XvPacked) ? "packed" : "planar"); | |
190 if (fo[i].id == format) | |
191 xv_format = fo[i].id; | |
192 } | |
193 if (!xv_format) | |
194 return -1; | |
195 } | |
2249
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2055
diff
changeset
|
196 |
27343 | 197 #ifdef CONFIG_GUI |
12582 | 198 if (use_gui) |
27878 | 199 guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
200 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
201 #endif |
723 | 202 { |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
203 #ifdef CONFIG_XF86VM |
12582 | 204 if (vm) |
205 { | |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
206 vo_vm_switch(); |
27895
69b4b8d73b5e
Remove a nonsensical "else" for the video mode switching case.
reimar
parents:
27892
diff
changeset
|
207 } |
12582 | 208 #endif |
209 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), | |
210 &attribs); | |
211 depth = attribs.depth; | |
212 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) | |
213 depth = 24; | |
214 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); | |
723 | 215 |
12582 | 216 xswa.background_pixel = 0; |
14742 | 217 if (xv_ck_info.method == CK_METHOD_BACKGROUND) |
218 { | |
219 xswa.background_pixel = xv_colorkey; | |
220 } | |
12582 | 221 xswa.border_pixel = 0; |
222 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 223 |
27891
8742bcad99b5
Use vo_dwidth/vo_dheight for creating the windows instead of d_width/d_height.
reimar
parents:
27890
diff
changeset
|
224 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:
23077
diff
changeset
|
225 flags, CopyFromParent, "xv", title); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23077
diff
changeset
|
226 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); |
12582 | 227 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
228 #ifdef CONFIG_XF86VM |
12582 | 229 if (vm) |
230 { | |
231 /* Grab the mouse pointer in our window */ | |
232 if (vo_grabpointer) | |
233 XGrabPointer(mDisplay, vo_window, True, 0, | |
234 GrabModeAsync, GrabModeAsync, | |
235 vo_window, None, CurrentTime); | |
236 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
237 } | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
238 #endif |
12582 | 239 } |
240 | |
241 mp_msg(MSGT_VO, MSGL_V, "using Xvideo port %d for hw scaling\n", | |
242 xv_port); | |
1 | 243 |
12582 | 244 switch (xv_format) |
245 { | |
246 case IMGFMT_YV12: | |
247 case IMGFMT_I420: | |
248 case IMGFMT_IYUV: | |
249 draw_alpha_fnc = draw_alpha_yv12; | |
250 break; | |
251 case IMGFMT_YUY2: | |
252 case IMGFMT_YVYU: | |
253 draw_alpha_fnc = draw_alpha_yuy2; | |
254 break; | |
255 case IMGFMT_UYVY: | |
256 draw_alpha_fnc = draw_alpha_uyvy; | |
257 break; | |
258 default: | |
259 draw_alpha_fnc = draw_alpha_null; | |
260 } | |
182 | 261 |
12582 | 262 if (vo_config_count) |
263 for (current_buf = 0; current_buf < num_buffers; ++current_buf) | |
264 deallocate_xvimage(current_buf); | |
7757 | 265 |
12582 | 266 for (current_buf = 0; current_buf < num_buffers; ++current_buf) |
267 allocate_xvimage(current_buf); | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
268 |
12582 | 269 current_buf = 0; |
270 current_ip_buf = 0; | |
1 | 271 |
22461
c54ad95f852a
Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents:
22232
diff
changeset
|
272 if ((flags & VOFLAG_FULLSCREEN) && WinID <= 0) vo_fs = 1; |
28250 | 273 vo_calc_drwXY(&drwX, &drwY); |
6382
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6366
diff
changeset
|
274 |
12582 | 275 panscan_calc(); |
18384
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
276 |
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
277 vo_xv_draw_colorkey(drwX - (vo_panscan_x >> 1), |
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
278 drwY - (vo_panscan_y >> 1), |
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
279 vo_dwidth + vo_panscan_x - 1, |
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
280 vo_dheight + vo_panscan_y - 1); |
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
281 |
12582 | 282 mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX, |
283 drwY, vo_dwidth, vo_dheight); | |
5945 | 284 |
12582 | 285 return 0; |
1 | 286 } |
287 | |
182 | 288 static void allocate_xvimage(int foo) |
1 | 289 { |
12582 | 290 /* |
291 * allocate XvImages. FIXME: no error checking, without | |
292 * mit-shm this will bomb... trzing to fix ::atmos | |
293 */ | |
6416 | 294 #ifdef HAVE_SHM |
12582 | 295 if (mLocalDisplay && XShmQueryExtension(mDisplay)) |
296 Shmem_Flag = 1; | |
297 else | |
298 { | |
299 Shmem_Flag = 0; | |
300 mp_msg(MSGT_VO, MSGL_INFO, | |
20765 | 301 MSGTR_LIBVO_XV_SharedMemoryNotSupported); |
12582 | 302 } |
303 if (Shmem_Flag) | |
304 { | |
305 xvimage[foo] = | |
306 (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format, | |
307 NULL, image_width, image_height, | |
308 &Shminfo[foo]); | |
1 | 309 |
12582 | 310 Shminfo[foo].shmid = |
311 shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); | |
312 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); | |
313 Shminfo[foo].readOnly = False; | |
1 | 314 |
12582 | 315 xvimage[foo]->data = Shminfo[foo].shmaddr; |
316 XShmAttach(mDisplay, &Shminfo[foo]); | |
317 XSync(mDisplay, False); | |
318 shmctl(Shminfo[foo].shmid, IPC_RMID, 0); | |
319 } else | |
6416 | 320 #endif |
12582 | 321 { |
322 xvimage[foo] = | |
323 (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, | |
324 image_width, image_height); | |
325 xvimage[foo]->data = malloc(xvimage[foo]->data_size); | |
326 XSync(mDisplay, False); | |
327 } | |
328 memset(xvimage[foo]->data, 128, xvimage[foo]->data_size); | |
329 return; | |
1 | 330 } |
331 | |
1794 | 332 static void deallocate_xvimage(int foo) |
333 { | |
6416 | 334 #ifdef HAVE_SHM |
12582 | 335 if (Shmem_Flag) |
336 { | |
337 XShmDetach(mDisplay, &Shminfo[foo]); | |
338 shmdt(Shminfo[foo].shmaddr); | |
339 } else | |
6416 | 340 #endif |
12582 | 341 { |
342 free(xvimage[foo]->data); | |
343 } | |
344 XFree(xvimage[foo]); | |
345 | |
346 XSync(mDisplay, False); | |
347 return; | |
1794 | 348 } |
349 | |
14782 | 350 static inline void put_xvimage( XvImage * xvi ) |
351 { | |
352 #ifdef HAVE_SHM | |
353 if (Shmem_Flag) | |
354 { | |
355 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
356 xvi, 0, 0, image_width, | |
357 image_height, drwX - (vo_panscan_x >> 1), | |
358 drwY - (vo_panscan_y >> 1), vo_dwidth + vo_panscan_x, | |
359 vo_dheight + vo_panscan_y, | |
360 False); | |
361 } else | |
362 #endif | |
363 { | |
364 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
365 xvi, 0, 0, image_width, image_height, | |
366 drwX - (vo_panscan_x >> 1), drwY - (vo_panscan_y >> 1), | |
367 vo_dwidth + vo_panscan_x, | |
368 vo_dheight + vo_panscan_y); | |
369 } | |
370 } | |
371 | |
31 | 372 static void check_events(void) |
1 | 373 { |
12582 | 374 int e = vo_x11_check_events(mDisplay); |
375 | |
376 if (e & VO_EVENT_RESIZE) | |
377 { | |
28250 | 378 vo_calc_drwXY(&drwX, &drwY); |
12582 | 379 } |
1 | 380 |
14742 | 381 if (e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) |
382 { | |
15192 | 383 vo_xv_draw_colorkey(drwX - (vo_panscan_x >> 1), |
384 drwY - (vo_panscan_y >> 1), | |
385 vo_dwidth + vo_panscan_x - 1, | |
386 vo_dheight + vo_panscan_y - 1); | |
14742 | 387 } |
388 | |
12582 | 389 if ((e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) && int_pause) |
14782 | 390 { |
391 /* did we already draw a buffer */ | |
392 if ( visible_buf != -1 ) | |
393 { | |
394 /* redraw the last visible buffer */ | |
395 put_xvimage( xvimage[visible_buf] ); | |
396 } | |
397 } | |
1 | 398 } |
399 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
400 static void draw_osd(void) |
12582 | 401 { |
402 vo_draw_text(image_width - | |
403 image_width * vo_panscan_x / (vo_dwidth + vo_panscan_x), | |
404 image_height, draw_alpha_fnc); | |
405 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
406 |
182 | 407 static void flip_page(void) |
1 | 408 { |
14782 | 409 put_xvimage( xvimage[current_buf] ); |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6295
diff
changeset
|
410 |
14782 | 411 /* remember the currently visible buffer */ |
412 visible_buf = current_buf; | |
413 | |
12582 | 414 if (num_buffers > 1) |
415 { | |
416 current_buf = | |
417 vo_directrendering ? 0 : ((current_buf + 1) % num_buffers); | |
418 XFlush(mDisplay); | |
419 } else | |
420 XSync(mDisplay, False); | |
421 return; | |
1 | 422 } |
423 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
424 static int draw_slice(uint8_t * image[], int stride[], int w, int h, |
12582 | 425 int x, int y) |
1 | 426 { |
12582 | 427 uint8_t *dst; |
182 | 428 |
12582 | 429 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + |
430 xvimage[current_buf]->pitches[0] * y + x; | |
431 memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0], | |
432 stride[0]); | |
182 | 433 |
12582 | 434 x /= 2; |
435 y /= 2; | |
436 w /= 2; | |
437 h /= 2; | |
1 | 438 |
12582 | 439 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + |
440 xvimage[current_buf]->pitches[1] * y + x; | |
441 if (image_format != IMGFMT_YV12) | |
442 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], | |
443 stride[1]); | |
444 else | |
445 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], | |
446 stride[2]); | |
5316 | 447 |
12582 | 448 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + |
449 xvimage[current_buf]->pitches[2] * y + x; | |
450 if (image_format == IMGFMT_YV12) | |
451 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], | |
452 stride[1]); | |
453 else | |
454 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], | |
455 stride[2]); | |
6231 | 456 |
12582 | 457 return 0; |
1 | 458 } |
459 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
460 static int draw_frame(uint8_t * src[]) |
12582 | 461 { |
27883
96831cf06109
Remove code from unused and since ages deprecated draw_frame function.
reimar
parents:
27882
diff
changeset
|
462 return VO_ERROR; |
1 | 463 } |
464 | |
12582 | 465 static uint32_t draw_image(mp_image_t * mpi) |
466 { | |
467 if (mpi->flags & MP_IMGFLAG_DIRECT) | |
468 { | |
469 // direct rendering: | |
470 current_buf = (int) (mpi->priv); // hack! | |
471 return VO_TRUE; | |
6760 | 472 } |
12582 | 473 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) |
474 return VO_TRUE; // done | |
475 if (mpi->flags & MP_IMGFLAG_PLANAR) | |
476 { | |
477 draw_slice(mpi->planes, mpi->stride, mpi->w, mpi->h, 0, 0); | |
478 return VO_TRUE; | |
7684 | 479 } |
12582 | 480 if (mpi->flags & MP_IMGFLAG_YUV) |
481 { | |
482 // packed YUV: | |
483 memcpy_pic(xvimage[current_buf]->data + | |
484 xvimage[current_buf]->offsets[0], mpi->planes[0], | |
485 mpi->w * (mpi->bpp / 8), mpi->h, | |
486 xvimage[current_buf]->pitches[0], mpi->stride[0]); | |
487 return VO_TRUE; | |
7684 | 488 } |
12582 | 489 return VO_FALSE; // not (yet) supported |
6760 | 490 } |
491 | |
12582 | 492 static uint32_t get_image(mp_image_t * mpi) |
493 { | |
494 int buf = current_buf; // we shouldn't change current_buf unless we do DR! | |
495 | |
496 if (mpi->type == MP_IMGTYPE_STATIC && num_buffers > 1) | |
497 return VO_FALSE; // it is not static | |
498 if (mpi->imgfmt != image_format) | |
499 return VO_FALSE; // needs conversion :( | |
4980 | 500 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram |
12582 | 501 if (mpi->flags & MP_IMGFLAG_READABLE && |
502 (mpi->type == MP_IMGTYPE_IPB || mpi->type == MP_IMGTYPE_IP)) | |
503 { | |
504 // reference (I/P) frame of IP or IPB: | |
505 if (num_buffers < 2) | |
506 return VO_FALSE; // not enough | |
507 current_ip_buf ^= 1; | |
508 // for IPB with 2 buffers we can DR only one of the 2 P frames: | |
509 if (mpi->type == MP_IMGTYPE_IPB && num_buffers < 3 | |
510 && current_ip_buf) | |
511 return VO_FALSE; | |
512 buf = current_ip_buf; | |
513 if (mpi->type == MP_IMGTYPE_IPB) | |
514 ++buf; // preserve space for B | |
6758
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
515 } |
12582 | 516 if (mpi->height > xvimage[buf]->height) |
517 return VO_FALSE; //buffer to small | |
518 if (mpi->width * (mpi->bpp / 8) > xvimage[buf]->pitches[0]) | |
519 return VO_FALSE; //buffer to small | |
520 if ((mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH)) | |
521 || (mpi->width * (mpi->bpp / 8) == xvimage[buf]->pitches[0])) | |
522 { | |
523 current_buf = buf; | |
524 mpi->planes[0] = | |
525 xvimage[current_buf]->data + xvimage[current_buf]->offsets[0]; | |
526 mpi->stride[0] = xvimage[current_buf]->pitches[0]; | |
527 mpi->width = mpi->stride[0] / (mpi->bpp / 8); | |
528 if (mpi->flags & MP_IMGFLAG_PLANAR) | |
529 { | |
530 if (mpi->flags & MP_IMGFLAG_SWAPPED) | |
531 { | |
532 // I420 | |
533 mpi->planes[1] = | |
534 xvimage[current_buf]->data + | |
535 xvimage[current_buf]->offsets[1]; | |
536 mpi->planes[2] = | |
537 xvimage[current_buf]->data + | |
538 xvimage[current_buf]->offsets[2]; | |
539 mpi->stride[1] = xvimage[current_buf]->pitches[1]; | |
540 mpi->stride[2] = xvimage[current_buf]->pitches[2]; | |
541 } else | |
542 { | |
543 // YV12 | |
544 mpi->planes[1] = | |
545 xvimage[current_buf]->data + | |
546 xvimage[current_buf]->offsets[2]; | |
547 mpi->planes[2] = | |
548 xvimage[current_buf]->data + | |
549 xvimage[current_buf]->offsets[1]; | |
550 mpi->stride[1] = xvimage[current_buf]->pitches[2]; | |
551 mpi->stride[2] = xvimage[current_buf]->pitches[1]; | |
552 } | |
553 } | |
554 mpi->flags |= MP_IMGFLAG_DIRECT; | |
555 mpi->priv = (void *) current_buf; | |
556 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n"); | |
557 return VO_TRUE; | |
4980 | 558 } |
559 return VO_FALSE; | |
560 } | |
561 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
562 static int query_format(uint32_t format) |
1 | 563 { |
10855 | 564 uint32_t i; |
12582 | 565 int flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; // FIXME! check for DOWN |
566 | |
567 /* check image formats */ | |
568 for (i = 0; i < formats; i++) | |
569 { | |
570 if (fo[i].id == format) | |
571 return flag; //xv_format = fo[i].id; | |
572 } | |
573 return 0; | |
1 | 574 } |
575 | |
12582 | 576 static void uninit(void) |
1852 | 577 { |
12582 | 578 int i; |
579 | |
580 if (!vo_config_count) | |
581 return; | |
14782 | 582 visible_buf = -1; |
12582 | 583 XvFreeAdaptorInfo(ai); |
584 ai = NULL; | |
13953 | 585 if(fo){ |
586 XFree(fo); | |
587 fo=NULL; | |
588 } | |
12582 | 589 for (i = 0; i < num_buffers; i++) |
590 deallocate_xvimage(i); | |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
591 #ifdef CONFIG_XF86VM |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
592 vo_vm_close(); |
6016 | 593 #endif |
24133 | 594 mp_input_rm_event_fd(ConnectionNumber(mDisplay)); |
12582 | 595 vo_x11_uninit(); |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
596 } |
1 | 597 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
598 static int preinit(const char *arg) |
4352 | 599 { |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
600 XvPortID xv_p; |
12582 | 601 int busy_ports = 0; |
10855 | 602 unsigned int i; |
14742 | 603 strarg_t ck_src_arg = { 0, NULL }; |
604 strarg_t ck_method_arg = { 0, NULL }; | |
26730
41794a5fb100
Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents:
25963
diff
changeset
|
605 int xv_adaptor = -1; |
14742 | 606 |
607 opt_t subopts[] = | |
608 { | |
609 /* name arg type arg var test */ | |
610 { "port", OPT_ARG_INT, &xv_port, (opt_test_f)int_pos }, | |
26730
41794a5fb100
Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents:
25963
diff
changeset
|
611 { "adaptor", OPT_ARG_INT, &xv_adaptor, (opt_test_f)int_non_neg }, |
14742 | 612 { "ck", OPT_ARG_STR, &ck_src_arg, xv_test_ck }, |
613 { "ck-method", OPT_ARG_STR, &ck_method_arg, xv_test_ckm }, | |
614 { NULL } | |
615 }; | |
12582 | 616 |
10826 | 617 xv_port = 0; |
618 | |
14742 | 619 /* parse suboptions */ |
620 if ( subopt_parse( arg, subopts ) != 0 ) | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
621 { |
14742 | 622 return -1; |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
623 } |
14742 | 624 |
625 /* modify colorkey settings according to the given options */ | |
626 xv_setup_colorkeyhandling( ck_method_arg.str, ck_src_arg.str ); | |
627 | |
12582 | 628 if (!vo_init()) |
629 return -1; | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
630 |
12582 | 631 /* check for Xvideo extension */ |
632 if (Success != XvQueryExtension(mDisplay, &ver, &rel, &req, &ev, &err)) | |
633 { | |
634 mp_msg(MSGT_VO, MSGL_ERR, | |
20765 | 635 MSGTR_LIBVO_XV_XvNotSupportedByX11); |
12582 | 636 return -1; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
637 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
638 |
12582 | 639 /* check for Xvideo support */ |
640 if (Success != | |
641 XvQueryAdaptors(mDisplay, DefaultRootWindow(mDisplay), &adaptors, | |
642 &ai)) | |
643 { | |
20765 | 644 mp_msg(MSGT_VO, MSGL_ERR, MSGTR_LIBVO_XV_XvQueryAdaptorsFailed); |
12582 | 645 return -1; |
646 } | |
647 | |
648 /* check adaptors */ | |
649 if (xv_port) | |
650 { | |
10839 | 651 int port_found; |
12582 | 652 |
653 for (port_found = 0, i = 0; !port_found && i < adaptors; i++) | |
654 { | |
655 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) | |
656 { | |
657 for (xv_p = ai[i].base_id; | |
658 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p) | |
659 { | |
660 if (xv_p == xv_port) | |
661 { | |
10839 | 662 port_found = 1; |
663 break; | |
664 } | |
665 } | |
666 } | |
667 } | |
12582 | 668 if (port_found) |
669 { | |
10839 | 670 if (XvGrabPort(mDisplay, xv_port, CurrentTime)) |
671 xv_port = 0; | |
12582 | 672 } else |
673 { | |
674 mp_msg(MSGT_VO, MSGL_WARN, | |
20765 | 675 MSGTR_LIBVO_XV_InvalidPortParameter); |
10839 | 676 xv_port = 0; |
677 } | |
10826 | 678 } |
12582 | 679 |
680 for (i = 0; i < adaptors && xv_port == 0; i++) | |
681 { | |
26730
41794a5fb100
Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents:
25963
diff
changeset
|
682 /* check if adaptor number has been specified */ |
41794a5fb100
Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents:
25963
diff
changeset
|
683 if (xv_adaptor != -1 && xv_adaptor != i) |
41794a5fb100
Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents:
25963
diff
changeset
|
684 continue; |
41794a5fb100
Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents:
25963
diff
changeset
|
685 |
12582 | 686 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) |
687 { | |
688 for (xv_p = ai[i].base_id; | |
689 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p) | |
690 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) | |
691 { | |
692 xv_port = xv_p; | |
27031
0f7770b2230d
Move message about which adapter is used to verbose mode.
diego
parents:
26755
diff
changeset
|
693 mp_msg(MSGT_VO, MSGL_V, |
0f7770b2230d
Move message about which adapter is used to verbose mode.
diego
parents:
26755
diff
changeset
|
694 "[VO_XV] Using Xv Adapter #%d (%s)\n", |
0f7770b2230d
Move message about which adapter is used to verbose mode.
diego
parents:
26755
diff
changeset
|
695 i, ai[i].name); |
12582 | 696 break; |
697 } else | |
698 { | |
699 mp_msg(MSGT_VO, MSGL_WARN, | |
20765 | 700 MSGTR_LIBVO_XV_CouldNotGrabPort, (int) xv_p); |
12582 | 701 ++busy_ports; |
702 } | |
703 } | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
704 } |
12582 | 705 if (!xv_port) |
706 { | |
707 if (busy_ports) | |
708 mp_msg(MSGT_VO, MSGL_ERR, | |
20765 | 709 MSGTR_LIBVO_XV_CouldNotFindFreePort); |
12582 | 710 else |
711 mp_msg(MSGT_VO, MSGL_ERR, | |
20765 | 712 MSGTR_LIBVO_XV_NoXvideoSupport); |
12582 | 713 return -1; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
714 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
715 |
14742 | 716 if ( !vo_xv_init_colorkey() ) |
7857
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
717 { |
14742 | 718 return -1; // bail out, colorkey setup failed |
7857
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
719 } |
15826
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15540
diff
changeset
|
720 vo_xv_enable_vsync(); |
16958 | 721 vo_xv_get_max_img_dim( &max_width, &max_height ); |
7857
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
722 |
12582 | 723 fo = XvListImageFormats(mDisplay, xv_port, (int *) &formats); |
5566 | 724 |
24133 | 725 mp_input_add_event_fd(ConnectionNumber(mDisplay), check_events); |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
726 return 0; |
4352 | 727 } |
1 | 728 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
729 static int control(uint32_t request, void *data, ...) |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
730 { |
12582 | 731 switch (request) |
732 { | |
733 case VOCTRL_PAUSE: | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26730
diff
changeset
|
734 return int_pause = 1; |
12582 | 735 case VOCTRL_RESUME: |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26730
diff
changeset
|
736 return int_pause = 0; |
12582 | 737 case VOCTRL_QUERY_FORMAT: |
738 return query_format(*((uint32_t *) data)); | |
739 case VOCTRL_GET_IMAGE: | |
740 return get_image(data); | |
741 case VOCTRL_DRAW_IMAGE: | |
742 return draw_image(data); | |
743 case VOCTRL_GUISUPPORT: | |
744 return VO_TRUE; | |
745 case VOCTRL_GET_PANSCAN: | |
746 if (!vo_config_count || !vo_fs) | |
747 return VO_FALSE; | |
748 return VO_TRUE; | |
749 case VOCTRL_FULLSCREEN: | |
750 vo_x11_fullscreen(); | |
751 /* indended, fallthrough to update panscan on fullscreen/windowed switch */ | |
752 case VOCTRL_SET_PANSCAN: | |
753 if ((vo_fs && (vo_panscan != vo_panscan_amount)) | |
754 || (!vo_fs && vo_panscan_amount)) | |
755 { | |
756 int old_y = vo_panscan_y; | |
757 | |
758 panscan_calc(); | |
759 | |
760 if (old_y != vo_panscan_y) | |
761 { | |
762 vo_x11_clearwindow_part(mDisplay, vo_window, | |
763 vo_dwidth + vo_panscan_x - 1, | |
764 vo_dheight + vo_panscan_y - 1, | |
765 1); | |
15190 | 766 vo_xv_draw_colorkey(drwX - (vo_panscan_x >> 1), |
767 drwY - (vo_panscan_y >> 1), | |
768 vo_dwidth + vo_panscan_x - 1, | |
769 vo_dheight + vo_panscan_y - 1); | |
12582 | 770 flip_page(); |
771 } | |
772 } | |
773 return VO_TRUE; | |
774 case VOCTRL_SET_EQUALIZER: | |
775 { | |
776 va_list ap; | |
777 int value; | |
778 | |
779 va_start(ap, data); | |
780 value = va_arg(ap, int); | |
781 | |
782 va_end(ap); | |
783 | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26730
diff
changeset
|
784 return vo_xv_set_eq(xv_port, data, value); |
12582 | 785 } |
786 case VOCTRL_GET_EQUALIZER: | |
787 { | |
788 va_list ap; | |
789 int *value; | |
790 | |
791 va_start(ap, data); | |
792 value = va_arg(ap, int *); | |
793 | |
794 va_end(ap); | |
795 | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26730
diff
changeset
|
796 return vo_xv_get_eq(xv_port, data, value); |
12582 | 797 } |
798 case VOCTRL_ONTOP: | |
799 vo_x11_ontop(); | |
800 return VO_TRUE; | |
22232 | 801 case VOCTRL_UPDATE_SCREENINFO: |
802 update_xinerama_info(); | |
803 return VO_TRUE; | |
12582 | 804 } |
805 return VO_NOTIMPL; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
806 } |