Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 20826:bad45d01be6a
Remove loader_objfix.sh hack, it's only needed for very old OpenBSD versions.
author | diego |
---|---|
date | Fri, 10 Nov 2006 18:28:53 +0000 |
parents | dd41a1fc9000 |
children | bca522054afe |
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 | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
42 #ifdef HAVE_NEW_GUI |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13242
diff
changeset
|
43 #include "Gui/interface.h" |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
44 #endif |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
45 |
12582 | 46 static vo_info_t info = { |
47 "X11/Xv", | |
48 "xv", | |
49 "Gerd Knorr <kraxel@goldbach.in-berlin.de> and others", | |
50 "" | |
1 | 51 }; |
52 | |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7857
diff
changeset
|
53 LIBVO_EXTERN(xv) |
6719
5291d74a60c9
xv support under cygwin - patch by Sycotic Smith <sycotic at linuxmail.org>
alex
parents:
6417
diff
changeset
|
54 #ifdef HAVE_SHM |
1 | 55 #include <sys/ipc.h> |
56 #include <sys/shm.h> | |
57 #include <X11/extensions/XShm.h> | |
6416 | 58 /* since it doesn't seem to be defined on some platforms */ |
12582 | 59 int XShmGetEventBase(Display *); |
6416 | 60 |
61 static XShmSegmentInfo Shminfo[NUM_BUFFERS]; | |
6417
44bca09c1edd
100l accidently removed a line too much (Shmem_Flag)
atmos4
parents:
6416
diff
changeset
|
62 static int Shmem_Flag; |
6416 | 63 #endif |
64 | |
10855 | 65 // Note: depends on the inclusion of X11/extensions/XShm.h |
66 #include <X11/extensions/Xv.h> | |
67 #include <X11/extensions/Xvlib.h> | |
68 | |
69 // FIXME: dynamically allocate this stuff | |
70 static void allocate_xvimage(int); | |
12582 | 71 static unsigned int ver, rel, req, ev, err; |
14742 | 72 static unsigned int formats, adaptors, xv_format; |
12582 | 73 static XvAdaptorInfo *ai = NULL; |
13953 | 74 static XvImageFormatValues *fo=NULL; |
10855 | 75 |
12582 | 76 static int current_buf = 0; |
77 static int current_ip_buf = 0; | |
78 static int num_buffers = 1; // default | |
14782 | 79 static int visible_buf = -1; // -1 means: no buffer was drawn yet |
12582 | 80 static XvImage *xvimage[NUM_BUFFERS]; |
10855 | 81 |
82 | |
1 | 83 static uint32_t image_width; |
84 static uint32_t image_height; | |
85 static uint32_t image_format; | |
4629 | 86 static int flip_flag; |
1 | 87 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10359
diff
changeset
|
88 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
|
89 |
12582 | 90 static Window mRoot; |
91 static uint32_t drwX, drwY, drwBorderWidth, drwDepth; | |
92 static uint32_t dwidth, dheight; | |
16958 | 93 static uint32_t max_width = 0, max_height = 0; // zero means: not set |
1 | 94 |
12582 | 95 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h, |
96 unsigned char *src, unsigned char *srca, | |
97 int stride); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
98 |
12582 | 99 static void draw_alpha_yv12(int x0, int y0, int w, int h, |
100 unsigned char *src, unsigned char *srca, | |
101 int stride) | |
102 { | |
103 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); | |
104 vo_draw_alpha_yv12(w, h, src, srca, stride, | |
105 xvimage[current_buf]->data + | |
106 xvimage[current_buf]->offsets[0] + | |
107 xvimage[current_buf]->pitches[0] * y0 + x0, | |
108 xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
109 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
110 |
12582 | 111 static void draw_alpha_yuy2(int x0, int y0, int w, int h, |
112 unsigned char *src, unsigned char *srca, | |
113 int stride) | |
114 { | |
115 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); | |
116 vo_draw_alpha_yuy2(w, h, src, srca, stride, | |
117 xvimage[current_buf]->data + | |
118 xvimage[current_buf]->offsets[0] + | |
119 xvimage[current_buf]->pitches[0] * y0 + 2 * x0, | |
120 xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
121 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
122 |
12582 | 123 static void draw_alpha_uyvy(int x0, int y0, int w, int h, |
124 unsigned char *src, unsigned char *srca, | |
125 int stride) | |
126 { | |
127 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); | |
128 vo_draw_alpha_yuy2(w, h, src, srca, stride, | |
129 xvimage[current_buf]->data + | |
130 xvimage[current_buf]->offsets[0] + | |
131 xvimage[current_buf]->pitches[0] * y0 + 2 * x0 + 1, | |
132 xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
133 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
134 |
12582 | 135 static void draw_alpha_null(int x0, int y0, int w, int h, |
136 unsigned char *src, unsigned char *srca, | |
137 int stride) | |
138 { | |
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 |
6786 | 141 |
7757 | 142 static void deallocate_xvimage(int foo); |
143 | |
182 | 144 /* |
145 * connect to server, create and map window, | |
1 | 146 * allocate colors and (shared) memory |
147 */ | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
148 static int config(uint32_t width, uint32_t height, uint32_t d_width, |
12582 | 149 uint32_t d_height, uint32_t flags, char *title, |
150 uint32_t format) | |
1 | 151 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
152 // int screen; |
12582 | 153 char *hello = (title == NULL) ? "Xv render" : title; |
154 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
155 // char *name = ":0.0"; |
12582 | 156 XSizeHints hint; |
157 XVisualInfo vinfo; | |
158 XGCValues xgcv; | |
159 XSetWindowAttributes xswa; | |
160 XWindowAttributes attribs; | |
161 unsigned long xswamask; | |
162 int depth; | |
163 | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
164 #ifdef HAVE_XF86VM |
12582 | 165 int vm = 0; |
166 unsigned int modeline_width, modeline_height; | |
167 static uint32_t vm_width; | |
168 static uint32_t vm_height; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
169 #endif |
1 | 170 |
12582 | 171 panscan_init(); |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6295
diff
changeset
|
172 |
12582 | 173 aspect_save_orig(width, height); |
174 aspect_save_prescale(d_width, d_height); | |
175 | |
176 image_height = height; | |
177 image_width = width; | |
178 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
|
179 |
16958 | 180 if ((max_width != 0 && max_height != 0) && |
181 (image_width > max_width || image_height > max_height)) | |
182 { | |
20765 | 183 mp_msg( MSGT_VO, MSGL_ERR, MSGTR_VO_XV_ImagedimTooHigh, |
16958 | 184 image_width, image_height, max_width, max_height); |
185 return -1; | |
186 } | |
187 | |
12582 | 188 vo_mouse_autohide = 1; |
189 | |
190 int_pause = 0; | |
14782 | 191 visible_buf = -1; |
1 | 192 |
18116 | 193 update_xinerama_info(); |
18509
94965d83e2b6
do aspect correction of video size before calculating vo_dx and vo_dy.
reimar
parents:
18384
diff
changeset
|
194 aspect(&d_width, &d_height, A_NOZOOM); |
12582 | 195 vo_dx = (vo_screenwidth - d_width) / 2; |
196 vo_dy = (vo_screenheight - d_height) / 2; | |
197 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, | |
198 vo_screenheight); | |
18116 | 199 vo_dx += xinerama_x; |
200 vo_dy += xinerama_y; | |
12582 | 201 vo_dwidth = d_width; |
202 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:
10359
diff
changeset
|
203 |
4978 | 204 #ifdef HAVE_XF86VM |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
15192
diff
changeset
|
205 if (flags & VOFLAG_MODESWITCHING) |
12582 | 206 vm = 1; |
4978 | 207 #endif |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
15192
diff
changeset
|
208 flip_flag = flags & VOFLAG_FLIPPING; |
12582 | 209 num_buffers = |
210 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
|
211 |
12582 | 212 /* check image formats */ |
213 { | |
214 unsigned int i; | |
10855 | 215 |
12582 | 216 xv_format = 0; |
217 for (i = 0; i < formats; i++) | |
218 { | |
219 mp_msg(MSGT_VO, MSGL_V, | |
220 "Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id, | |
221 (char *) &fo[i].id, | |
222 (fo[i].format == XvPacked) ? "packed" : "planar"); | |
223 if (fo[i].id == format) | |
224 xv_format = fo[i].id; | |
225 } | |
226 if (!xv_format) | |
227 return -1; | |
228 } | |
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
|
229 |
1775 | 230 #ifdef HAVE_NEW_GUI |
12582 | 231 if (use_gui) |
232 guiGetEvent(guiSetShVideo, 0); // let the GUI to setup/resize our window | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
233 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
234 #endif |
723 | 235 { |
12582 | 236 hint.x = vo_dx; |
237 hint.y = vo_dy; | |
238 hint.width = d_width; | |
239 hint.height = d_height; | |
240 #ifdef HAVE_XF86VM | |
241 if (vm) | |
242 { | |
243 if ((d_width == 0) && (d_height == 0)) | |
244 { | |
245 vm_width = image_width; | |
246 vm_height = image_height; | |
247 } else | |
248 { | |
249 vm_width = d_width; | |
250 vm_height = d_height; | |
251 } | |
252 vo_vm_switch(vm_width, vm_height, &modeline_width, | |
253 &modeline_height); | |
254 hint.x = (vo_screenwidth - modeline_width) / 2; | |
255 hint.y = (vo_screenheight - modeline_height) / 2; | |
256 hint.width = modeline_width; | |
257 hint.height = modeline_height; | |
258 aspect_save_screenres(modeline_width, modeline_height); | |
259 } else | |
260 #endif | |
261 if (vo_fs) | |
262 { | |
2054 | 263 #ifdef X11_FULLSCREEN |
12582 | 264 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
265 * aspect() is available through aspect.h for all vos. | |
266 * besides zooming should only be done with -zoom, | |
267 * but I leave the old -fs behaviour so users don't get | |
268 * irritated for now (and send lots o' mails ;) ::atmos | |
269 */ | |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
270 |
12582 | 271 aspect(&d_width, &d_height, A_ZOOM); |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
272 #endif |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
273 |
12582 | 274 } |
5945 | 275 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for? |
12582 | 276 vo_dwidth = d_width; |
277 vo_dheight = d_height; | |
278 hint.flags = PPosition | PSize /* | PBaseSize */ ; | |
279 hint.base_width = hint.width; | |
280 hint.base_height = hint.height; | |
281 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), | |
282 &attribs); | |
283 depth = attribs.depth; | |
284 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) | |
285 depth = 24; | |
286 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); | |
723 | 287 |
12582 | 288 xswa.background_pixel = 0; |
14742 | 289 if (xv_ck_info.method == CK_METHOD_BACKGROUND) |
290 { | |
291 xswa.background_pixel = xv_colorkey; | |
292 } | |
12582 | 293 xswa.border_pixel = 0; |
294 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 295 |
12582 | 296 if (WinID >= 0) |
297 { | |
298 vo_window = WinID ? ((Window) WinID) : mRootWin; | |
299 if (WinID) | |
300 { | |
301 XUnmapWindow(mDisplay, vo_window); | |
302 XChangeWindowAttributes(mDisplay, vo_window, xswamask, | |
303 &xswa); | |
304 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
305 StructureNotifyMask | | |
306 KeyPressMask | | |
307 PropertyChangeMask | | |
308 PointerMotionMask | | |
309 ButtonPressMask | | |
310 ButtonReleaseMask | | |
311 ExposureMask); | |
312 XMapWindow(mDisplay, vo_window); | |
15540 | 313 XGetGeometry(mDisplay, vo_window, &mRoot, |
314 &drwX, &drwY, &vo_dwidth, &vo_dheight, | |
315 &drwBorderWidth, &drwDepth); | |
316 drwX = drwY = 0; // coordinates need to be local to the window | |
317 aspect_save_prescale(vo_dwidth, vo_dheight); | |
12582 | 318 } else |
319 { | |
320 drwX = vo_dx; | |
321 drwY = vo_dy; | |
322 } | |
323 } else if (vo_window == None) | |
324 { | |
325 vo_window = | |
326 vo_x11_create_smooth_window(mDisplay, mRootWin, | |
327 vinfo.visual, hint.x, hint.y, | |
328 hint.width, hint.height, depth, | |
329 CopyFromParent); | |
14742 | 330 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); |
3830 | 331 |
12582 | 332 vo_x11_classhint(mDisplay, vo_window, "xv"); |
333 vo_hidecursor(mDisplay, vo_window); | |
3830 | 334 |
12582 | 335 vo_x11_selectinput_witherr(mDisplay, vo_window, |
336 StructureNotifyMask | KeyPressMask | | |
337 PropertyChangeMask | ((WinID == 0) ? | |
338 0 | |
339 : | |
340 (PointerMotionMask | |
341 | | |
342 ButtonPressMask | |
343 | | |
344 ButtonReleaseMask | |
345 | | |
346 ExposureMask))); | |
347 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, | |
348 NULL, 0, &hint); | |
14797
05eab20de476
Always use vo_x11_sizehint function ( even when going fullscreen ) to
al
parents:
14782
diff
changeset
|
349 vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height, 0); |
12582 | 350 XMapWindow(mDisplay, vo_window); |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18509
diff
changeset
|
351 vo_x11_nofs_sizepos(hint.x, hint.y, hint.width, hint.height); |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
15192
diff
changeset
|
352 if (flags & VOFLAG_FULLSCREEN) |
12582 | 353 vo_x11_fullscreen(); |
354 } else | |
355 { | |
356 // vo_fs set means we were already at fullscreen | |
357 vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height, 0); | |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18509
diff
changeset
|
358 vo_x11_nofs_sizepos(hint.x, hint.y, hint.width, hint.height); |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
15192
diff
changeset
|
359 if (flags & VOFLAG_FULLSCREEN && !vo_fs) |
12582 | 360 vo_x11_fullscreen(); // handle -fs on non-first file |
361 } | |
362 | |
9161 | 363 // vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); |
12582 | 364 |
365 if (vo_gc != None) | |
366 XFreeGC(mDisplay, vo_gc); | |
367 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | |
368 XSync(mDisplay, False); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
369 #ifdef HAVE_XF86VM |
12582 | 370 if (vm) |
371 { | |
372 /* Grab the mouse pointer in our window */ | |
373 if (vo_grabpointer) | |
374 XGrabPointer(mDisplay, vo_window, True, 0, | |
375 GrabModeAsync, GrabModeAsync, | |
376 vo_window, None, CurrentTime); | |
377 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
378 } | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
379 #endif |
12582 | 380 } |
381 | |
382 mp_msg(MSGT_VO, MSGL_V, "using Xvideo port %d for hw scaling\n", | |
383 xv_port); | |
1 | 384 |
12582 | 385 switch (xv_format) |
386 { | |
387 case IMGFMT_YV12: | |
388 case IMGFMT_I420: | |
389 case IMGFMT_IYUV: | |
390 draw_alpha_fnc = draw_alpha_yv12; | |
391 break; | |
392 case IMGFMT_YUY2: | |
393 case IMGFMT_YVYU: | |
394 draw_alpha_fnc = draw_alpha_yuy2; | |
395 break; | |
396 case IMGFMT_UYVY: | |
397 draw_alpha_fnc = draw_alpha_uyvy; | |
398 break; | |
399 default: | |
400 draw_alpha_fnc = draw_alpha_null; | |
401 } | |
182 | 402 |
12582 | 403 if (vo_config_count) |
404 for (current_buf = 0; current_buf < num_buffers; ++current_buf) | |
405 deallocate_xvimage(current_buf); | |
7757 | 406 |
12582 | 407 for (current_buf = 0; current_buf < num_buffers; ++current_buf) |
408 allocate_xvimage(current_buf); | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
409 |
12582 | 410 current_buf = 0; |
411 current_ip_buf = 0; | |
1 | 412 |
6764
7755d1d59394
fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents:
6760
diff
changeset
|
413 #if 0 |
12582 | 414 set_gamma_correction(); |
6764
7755d1d59394
fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents:
6760
diff
changeset
|
415 #endif |
1818 | 416 |
12582 | 417 aspect(&vo_dwidth, &vo_dheight, A_NOZOOM); |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
15192
diff
changeset
|
418 if (((flags & VOFLAG_FULLSCREEN) && (WinID <= 0)) || vo_fs) |
12582 | 419 { |
420 aspect(&vo_dwidth, &vo_dheight, A_ZOOM); | |
421 drwX = | |
422 (vo_screenwidth - | |
423 (vo_dwidth > | |
424 vo_screenwidth ? vo_screenwidth : vo_dwidth)) / 2; | |
425 drwY = | |
426 (vo_screenheight - | |
427 (vo_dheight > | |
428 vo_screenheight ? vo_screenheight : vo_dheight)) / 2; | |
429 vo_dwidth = | |
430 (vo_dwidth > vo_screenwidth ? vo_screenwidth : vo_dwidth); | |
431 vo_dheight = | |
432 (vo_dheight > vo_screenheight ? vo_screenheight : vo_dheight); | |
433 mp_msg(MSGT_VO, MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n", | |
434 drwX, drwY, vo_dwidth, vo_dheight); | |
435 } | |
6382
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6366
diff
changeset
|
436 |
12582 | 437 panscan_calc(); |
18384
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
438 |
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
439 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
|
440 drwY - (vo_panscan_y >> 1), |
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
441 vo_dwidth + vo_panscan_x - 1, |
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
442 vo_dheight + vo_panscan_y - 1); |
29a25bcb3d99
Make sure black borders are drawn when switching videos with -fixed-vo.
reimar
parents:
18234
diff
changeset
|
443 |
9381
007a1bdce1f4
reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents:
9326
diff
changeset
|
444 |
007a1bdce1f4
reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents:
9326
diff
changeset
|
445 #if 0 |
9161 | 446 #ifdef HAVE_SHM |
12582 | 447 if (Shmem_Flag) |
448 { | |
449 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
450 xvimage[current_buf], 0, 0, image_width, | |
451 image_height, drwX, drwY, 1, 1, False); | |
452 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
453 xvimage[current_buf], 0, 0, image_width, | |
454 image_height, drwX, drwY, vo_dwidth, | |
455 (vo_fs ? vo_dheight - 1 : vo_dheight), False); | |
456 } else | |
9161 | 457 #endif |
12582 | 458 { |
459 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
460 xvimage[current_buf], 0, 0, image_width, image_height, | |
461 drwX, drwY, 1, 1); | |
462 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
463 xvimage[current_buf], 0, 0, image_width, image_height, | |
464 drwX, drwY, vo_dwidth, | |
465 (vo_fs ? vo_dheight - 1 : vo_dheight)); | |
466 } | |
9381
007a1bdce1f4
reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents:
9326
diff
changeset
|
467 #endif |
12582 | 468 |
469 mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX, | |
470 drwY, vo_dwidth, vo_dheight); | |
5945 | 471 |
12582 | 472 if (vo_ontop) |
473 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 474 |
12582 | 475 return 0; |
1 | 476 } |
477 | |
182 | 478 static void allocate_xvimage(int foo) |
1 | 479 { |
12582 | 480 /* |
481 * allocate XvImages. FIXME: no error checking, without | |
482 * mit-shm this will bomb... trzing to fix ::atmos | |
483 */ | |
6416 | 484 #ifdef HAVE_SHM |
12582 | 485 if (mLocalDisplay && XShmQueryExtension(mDisplay)) |
486 Shmem_Flag = 1; | |
487 else | |
488 { | |
489 Shmem_Flag = 0; | |
490 mp_msg(MSGT_VO, MSGL_INFO, | |
20765 | 491 MSGTR_LIBVO_XV_SharedMemoryNotSupported); |
12582 | 492 } |
493 if (Shmem_Flag) | |
494 { | |
495 xvimage[foo] = | |
496 (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format, | |
497 NULL, image_width, image_height, | |
498 &Shminfo[foo]); | |
1 | 499 |
12582 | 500 Shminfo[foo].shmid = |
501 shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); | |
502 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); | |
503 Shminfo[foo].readOnly = False; | |
1 | 504 |
12582 | 505 xvimage[foo]->data = Shminfo[foo].shmaddr; |
506 XShmAttach(mDisplay, &Shminfo[foo]); | |
507 XSync(mDisplay, False); | |
508 shmctl(Shminfo[foo].shmid, IPC_RMID, 0); | |
509 } else | |
6416 | 510 #endif |
12582 | 511 { |
512 xvimage[foo] = | |
513 (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, | |
514 image_width, image_height); | |
515 xvimage[foo]->data = malloc(xvimage[foo]->data_size); | |
516 XSync(mDisplay, False); | |
517 } | |
518 memset(xvimage[foo]->data, 128, xvimage[foo]->data_size); | |
519 return; | |
1 | 520 } |
521 | |
1794 | 522 static void deallocate_xvimage(int foo) |
523 { | |
6416 | 524 #ifdef HAVE_SHM |
12582 | 525 if (Shmem_Flag) |
526 { | |
527 XShmDetach(mDisplay, &Shminfo[foo]); | |
528 shmdt(Shminfo[foo].shmaddr); | |
529 } else | |
6416 | 530 #endif |
12582 | 531 { |
532 free(xvimage[foo]->data); | |
533 } | |
534 XFree(xvimage[foo]); | |
535 | |
536 XSync(mDisplay, False); | |
537 return; | |
1794 | 538 } |
539 | |
14782 | 540 static inline void put_xvimage( XvImage * xvi ) |
541 { | |
542 #ifdef HAVE_SHM | |
543 if (Shmem_Flag) | |
544 { | |
545 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
546 xvi, 0, 0, image_width, | |
547 image_height, drwX - (vo_panscan_x >> 1), | |
548 drwY - (vo_panscan_y >> 1), vo_dwidth + vo_panscan_x, | |
549 vo_dheight + vo_panscan_y, | |
550 False); | |
551 } else | |
552 #endif | |
553 { | |
554 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
555 xvi, 0, 0, image_width, image_height, | |
556 drwX - (vo_panscan_x >> 1), drwY - (vo_panscan_y >> 1), | |
557 vo_dwidth + vo_panscan_x, | |
558 vo_dheight + vo_panscan_y); | |
559 } | |
560 } | |
561 | |
31 | 562 static void check_events(void) |
1 | 563 { |
12582 | 564 int e = vo_x11_check_events(mDisplay); |
565 | |
566 if (e & VO_EVENT_RESIZE) | |
567 { | |
568 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &vo_dwidth, | |
569 &vo_dheight, &drwBorderWidth, &drwDepth); | |
570 drwX = drwY = 0; | |
571 mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX, | |
572 drwY, vo_dwidth, vo_dheight); | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10359
diff
changeset
|
573 |
12582 | 574 aspect(&dwidth, &dheight, A_NOZOOM); |
575 if (vo_fs) | |
576 { | |
577 aspect(&dwidth, &dheight, A_ZOOM); | |
578 drwX = | |
579 (vo_screenwidth - | |
580 (dwidth > vo_screenwidth ? vo_screenwidth : dwidth)) / 2; | |
581 drwY = | |
582 (vo_screenheight - | |
583 (dheight > | |
584 vo_screenheight ? vo_screenheight : dheight)) / 2; | |
585 vo_dwidth = | |
586 (dwidth > vo_screenwidth ? vo_screenwidth : dwidth); | |
587 vo_dheight = | |
588 (dheight > vo_screenheight ? vo_screenheight : dheight); | |
589 mp_msg(MSGT_VO, MSGL_V, | |
590 "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n", drwX, drwY, | |
591 vo_dwidth, vo_dheight); | |
592 } | |
593 } | |
1 | 594 |
14742 | 595 if (e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) |
596 { | |
15192 | 597 vo_xv_draw_colorkey(drwX - (vo_panscan_x >> 1), |
598 drwY - (vo_panscan_y >> 1), | |
599 vo_dwidth + vo_panscan_x - 1, | |
600 vo_dheight + vo_panscan_y - 1); | |
14742 | 601 } |
602 | |
12582 | 603 if ((e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) && int_pause) |
14782 | 604 { |
605 /* did we already draw a buffer */ | |
606 if ( visible_buf != -1 ) | |
607 { | |
608 /* redraw the last visible buffer */ | |
609 put_xvimage( xvimage[visible_buf] ); | |
610 } | |
611 } | |
1 | 612 } |
613 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
614 static void draw_osd(void) |
12582 | 615 { |
616 vo_draw_text(image_width - | |
617 image_width * vo_panscan_x / (vo_dwidth + vo_panscan_x), | |
618 image_height, draw_alpha_fnc); | |
619 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
620 |
182 | 621 static void flip_page(void) |
1 | 622 { |
14782 | 623 put_xvimage( xvimage[current_buf] ); |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6295
diff
changeset
|
624 |
14782 | 625 /* remember the currently visible buffer */ |
626 visible_buf = current_buf; | |
627 | |
12582 | 628 if (num_buffers > 1) |
629 { | |
630 current_buf = | |
631 vo_directrendering ? 0 : ((current_buf + 1) % num_buffers); | |
632 XFlush(mDisplay); | |
633 } else | |
634 XSync(mDisplay, False); | |
635 return; | |
1 | 636 } |
637 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
638 static int draw_slice(uint8_t * image[], int stride[], int w, int h, |
12582 | 639 int x, int y) |
1 | 640 { |
12582 | 641 uint8_t *dst; |
182 | 642 |
12582 | 643 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + |
644 xvimage[current_buf]->pitches[0] * y + x; | |
645 memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0], | |
646 stride[0]); | |
182 | 647 |
12582 | 648 x /= 2; |
649 y /= 2; | |
650 w /= 2; | |
651 h /= 2; | |
1 | 652 |
12582 | 653 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + |
654 xvimage[current_buf]->pitches[1] * y + x; | |
655 if (image_format != IMGFMT_YV12) | |
656 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], | |
657 stride[1]); | |
658 else | |
659 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], | |
660 stride[2]); | |
5316 | 661 |
12582 | 662 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + |
663 xvimage[current_buf]->pitches[2] * y + x; | |
664 if (image_format == IMGFMT_YV12) | |
665 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], | |
666 stride[1]); | |
667 else | |
668 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], | |
669 stride[2]); | |
6231 | 670 |
12582 | 671 return 0; |
1 | 672 } |
673 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
674 static int draw_frame(uint8_t * src[]) |
12582 | 675 { |
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
|
676 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_XV_DrawFrameCalled); |
7684 | 677 return -1; |
1 | 678 } |
679 | |
12582 | 680 static uint32_t draw_image(mp_image_t * mpi) |
681 { | |
682 if (mpi->flags & MP_IMGFLAG_DIRECT) | |
683 { | |
684 // direct rendering: | |
685 current_buf = (int) (mpi->priv); // hack! | |
686 return VO_TRUE; | |
6760 | 687 } |
12582 | 688 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) |
689 return VO_TRUE; // done | |
690 if (mpi->flags & MP_IMGFLAG_PLANAR) | |
691 { | |
692 draw_slice(mpi->planes, mpi->stride, mpi->w, mpi->h, 0, 0); | |
693 return VO_TRUE; | |
7684 | 694 } |
12582 | 695 if (mpi->flags & MP_IMGFLAG_YUV) |
696 { | |
697 // packed YUV: | |
698 memcpy_pic(xvimage[current_buf]->data + | |
699 xvimage[current_buf]->offsets[0], mpi->planes[0], | |
700 mpi->w * (mpi->bpp / 8), mpi->h, | |
701 xvimage[current_buf]->pitches[0], mpi->stride[0]); | |
702 return VO_TRUE; | |
7684 | 703 } |
12582 | 704 return VO_FALSE; // not (yet) supported |
6760 | 705 } |
706 | |
12582 | 707 static uint32_t get_image(mp_image_t * mpi) |
708 { | |
709 int buf = current_buf; // we shouldn't change current_buf unless we do DR! | |
710 | |
711 if (mpi->type == MP_IMGTYPE_STATIC && num_buffers > 1) | |
712 return VO_FALSE; // it is not static | |
713 if (mpi->imgfmt != image_format) | |
714 return VO_FALSE; // needs conversion :( | |
4980 | 715 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram |
12582 | 716 if (mpi->flags & MP_IMGFLAG_READABLE && |
717 (mpi->type == MP_IMGTYPE_IPB || mpi->type == MP_IMGTYPE_IP)) | |
718 { | |
719 // reference (I/P) frame of IP or IPB: | |
720 if (num_buffers < 2) | |
721 return VO_FALSE; // not enough | |
722 current_ip_buf ^= 1; | |
723 // for IPB with 2 buffers we can DR only one of the 2 P frames: | |
724 if (mpi->type == MP_IMGTYPE_IPB && num_buffers < 3 | |
725 && current_ip_buf) | |
726 return VO_FALSE; | |
727 buf = current_ip_buf; | |
728 if (mpi->type == MP_IMGTYPE_IPB) | |
729 ++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
|
730 } |
12582 | 731 if (mpi->height > xvimage[buf]->height) |
732 return VO_FALSE; //buffer to small | |
733 if (mpi->width * (mpi->bpp / 8) > xvimage[buf]->pitches[0]) | |
734 return VO_FALSE; //buffer to small | |
735 if ((mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH)) | |
736 || (mpi->width * (mpi->bpp / 8) == xvimage[buf]->pitches[0])) | |
737 { | |
738 current_buf = buf; | |
739 mpi->planes[0] = | |
740 xvimage[current_buf]->data + xvimage[current_buf]->offsets[0]; | |
741 mpi->stride[0] = xvimage[current_buf]->pitches[0]; | |
742 mpi->width = mpi->stride[0] / (mpi->bpp / 8); | |
743 if (mpi->flags & MP_IMGFLAG_PLANAR) | |
744 { | |
745 if (mpi->flags & MP_IMGFLAG_SWAPPED) | |
746 { | |
747 // I420 | |
748 mpi->planes[1] = | |
749 xvimage[current_buf]->data + | |
750 xvimage[current_buf]->offsets[1]; | |
751 mpi->planes[2] = | |
752 xvimage[current_buf]->data + | |
753 xvimage[current_buf]->offsets[2]; | |
754 mpi->stride[1] = xvimage[current_buf]->pitches[1]; | |
755 mpi->stride[2] = xvimage[current_buf]->pitches[2]; | |
756 } else | |
757 { | |
758 // YV12 | |
759 mpi->planes[1] = | |
760 xvimage[current_buf]->data + | |
761 xvimage[current_buf]->offsets[2]; | |
762 mpi->planes[2] = | |
763 xvimage[current_buf]->data + | |
764 xvimage[current_buf]->offsets[1]; | |
765 mpi->stride[1] = xvimage[current_buf]->pitches[2]; | |
766 mpi->stride[2] = xvimage[current_buf]->pitches[1]; | |
767 } | |
768 } | |
769 mpi->flags |= MP_IMGFLAG_DIRECT; | |
770 mpi->priv = (void *) current_buf; | |
771 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n"); | |
772 return VO_TRUE; | |
4980 | 773 } |
774 return VO_FALSE; | |
775 } | |
776 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
777 static int query_format(uint32_t format) |
1 | 778 { |
10855 | 779 uint32_t i; |
12582 | 780 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 |
781 | |
782 /* check image formats */ | |
783 for (i = 0; i < formats; i++) | |
784 { | |
785 if (fo[i].id == format) | |
786 return flag; //xv_format = fo[i].id; | |
787 } | |
788 return 0; | |
1 | 789 } |
790 | |
12582 | 791 static void uninit(void) |
1852 | 792 { |
12582 | 793 int i; |
794 | |
795 if (!vo_config_count) | |
796 return; | |
14782 | 797 visible_buf = -1; |
12582 | 798 XvFreeAdaptorInfo(ai); |
799 ai = NULL; | |
13953 | 800 if(fo){ |
801 XFree(fo); | |
802 fo=NULL; | |
803 } | |
12582 | 804 for (i = 0; i < num_buffers; i++) |
805 deallocate_xvimage(i); | |
6016 | 806 #ifdef HAVE_XF86VM |
12582 | 807 vo_vm_close(mDisplay); |
6016 | 808 #endif |
12582 | 809 vo_x11_uninit(); |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
810 } |
1 | 811 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
812 static int preinit(const char *arg) |
4352 | 813 { |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
814 XvPortID xv_p; |
12582 | 815 int busy_ports = 0; |
10855 | 816 unsigned int i; |
14742 | 817 strarg_t ck_src_arg = { 0, NULL }; |
818 strarg_t ck_method_arg = { 0, NULL }; | |
819 | |
820 opt_t subopts[] = | |
821 { | |
822 /* name arg type arg var test */ | |
823 { "port", OPT_ARG_INT, &xv_port, (opt_test_f)int_pos }, | |
824 { "ck", OPT_ARG_STR, &ck_src_arg, xv_test_ck }, | |
825 { "ck-method", OPT_ARG_STR, &ck_method_arg, xv_test_ckm }, | |
826 { NULL } | |
827 }; | |
12582 | 828 |
10826 | 829 xv_port = 0; |
830 | |
14742 | 831 /* parse suboptions */ |
832 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
|
833 { |
14742 | 834 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
|
835 } |
14742 | 836 |
837 /* modify colorkey settings according to the given options */ | |
838 xv_setup_colorkeyhandling( ck_method_arg.str, ck_src_arg.str ); | |
839 | |
12582 | 840 if (!vo_init()) |
841 return -1; | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
842 |
12582 | 843 /* check for Xvideo extension */ |
844 if (Success != XvQueryExtension(mDisplay, &ver, &rel, &req, &ev, &err)) | |
845 { | |
846 mp_msg(MSGT_VO, MSGL_ERR, | |
20765 | 847 MSGTR_LIBVO_XV_XvNotSupportedByX11); |
12582 | 848 return -1; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
849 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
850 |
12582 | 851 /* check for Xvideo support */ |
852 if (Success != | |
853 XvQueryAdaptors(mDisplay, DefaultRootWindow(mDisplay), &adaptors, | |
854 &ai)) | |
855 { | |
20765 | 856 mp_msg(MSGT_VO, MSGL_ERR, MSGTR_LIBVO_XV_XvQueryAdaptorsFailed); |
12582 | 857 return -1; |
858 } | |
859 | |
860 /* check adaptors */ | |
861 if (xv_port) | |
862 { | |
10839 | 863 int port_found; |
12582 | 864 |
865 for (port_found = 0, i = 0; !port_found && i < adaptors; i++) | |
866 { | |
867 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) | |
868 { | |
869 for (xv_p = ai[i].base_id; | |
870 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p) | |
871 { | |
872 if (xv_p == xv_port) | |
873 { | |
10839 | 874 port_found = 1; |
875 break; | |
876 } | |
877 } | |
878 } | |
879 } | |
12582 | 880 if (port_found) |
881 { | |
10839 | 882 if (XvGrabPort(mDisplay, xv_port, CurrentTime)) |
883 xv_port = 0; | |
12582 | 884 } else |
885 { | |
886 mp_msg(MSGT_VO, MSGL_WARN, | |
20765 | 887 MSGTR_LIBVO_XV_InvalidPortParameter); |
10839 | 888 xv_port = 0; |
889 } | |
10826 | 890 } |
12582 | 891 |
892 for (i = 0; i < adaptors && xv_port == 0; i++) | |
893 { | |
894 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) | |
895 { | |
896 for (xv_p = ai[i].base_id; | |
897 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p) | |
898 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) | |
899 { | |
900 xv_port = xv_p; | |
901 break; | |
902 } else | |
903 { | |
904 mp_msg(MSGT_VO, MSGL_WARN, | |
20765 | 905 MSGTR_LIBVO_XV_CouldNotGrabPort, (int) xv_p); |
12582 | 906 ++busy_ports; |
907 } | |
908 } | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
909 } |
12582 | 910 if (!xv_port) |
911 { | |
912 if (busy_ports) | |
913 mp_msg(MSGT_VO, MSGL_ERR, | |
20765 | 914 MSGTR_LIBVO_XV_CouldNotFindFreePort); |
12582 | 915 else |
916 mp_msg(MSGT_VO, MSGL_ERR, | |
20765 | 917 MSGTR_LIBVO_XV_NoXvideoSupport); |
12582 | 918 return -1; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
919 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
920 |
14742 | 921 if ( !vo_xv_init_colorkey() ) |
7857
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
922 { |
14742 | 923 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
|
924 } |
15826
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15540
diff
changeset
|
925 vo_xv_enable_vsync(); |
16958 | 926 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
|
927 |
12582 | 928 fo = XvListImageFormats(mDisplay, xv_port, (int *) &formats); |
5566 | 929 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
930 return 0; |
4352 | 931 } |
1 | 932 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
933 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
|
934 { |
12582 | 935 switch (request) |
936 { | |
937 case VOCTRL_PAUSE: | |
938 return (int_pause = 1); | |
939 case VOCTRL_RESUME: | |
940 return (int_pause = 0); | |
941 case VOCTRL_QUERY_FORMAT: | |
942 return query_format(*((uint32_t *) data)); | |
943 case VOCTRL_GET_IMAGE: | |
944 return get_image(data); | |
945 case VOCTRL_DRAW_IMAGE: | |
946 return draw_image(data); | |
947 case VOCTRL_GUISUPPORT: | |
948 return VO_TRUE; | |
949 case VOCTRL_GET_PANSCAN: | |
950 if (!vo_config_count || !vo_fs) | |
951 return VO_FALSE; | |
952 return VO_TRUE; | |
953 case VOCTRL_FULLSCREEN: | |
954 vo_x11_fullscreen(); | |
955 /* indended, fallthrough to update panscan on fullscreen/windowed switch */ | |
956 case VOCTRL_SET_PANSCAN: | |
957 if ((vo_fs && (vo_panscan != vo_panscan_amount)) | |
958 || (!vo_fs && vo_panscan_amount)) | |
959 { | |
960 int old_y = vo_panscan_y; | |
961 | |
962 panscan_calc(); | |
963 | |
964 if (old_y != vo_panscan_y) | |
965 { | |
966 vo_x11_clearwindow_part(mDisplay, vo_window, | |
967 vo_dwidth + vo_panscan_x - 1, | |
968 vo_dheight + vo_panscan_y - 1, | |
969 1); | |
15190 | 970 vo_xv_draw_colorkey(drwX - (vo_panscan_x >> 1), |
971 drwY - (vo_panscan_y >> 1), | |
972 vo_dwidth + vo_panscan_x - 1, | |
973 vo_dheight + vo_panscan_y - 1); | |
12582 | 974 flip_page(); |
975 } | |
976 } | |
977 return VO_TRUE; | |
978 case VOCTRL_SET_EQUALIZER: | |
979 { | |
980 va_list ap; | |
981 int value; | |
982 | |
983 va_start(ap, data); | |
984 value = va_arg(ap, int); | |
985 | |
986 va_end(ap); | |
987 | |
988 return (vo_xv_set_eq(xv_port, data, value)); | |
989 } | |
990 case VOCTRL_GET_EQUALIZER: | |
991 { | |
992 va_list ap; | |
993 int *value; | |
994 | |
995 va_start(ap, data); | |
996 value = va_arg(ap, int *); | |
997 | |
998 va_end(ap); | |
999 | |
1000 return (vo_xv_get_eq(xv_port, data, value)); | |
1001 } | |
1002 case VOCTRL_ONTOP: | |
1003 vo_x11_ontop(); | |
1004 return VO_TRUE; | |
1005 } | |
1006 return VO_NOTIMPL; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
1007 } |