Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 18005:1aed2b2c2983
prevent overflow.. wtf?! from irc:
<@tcsetattr> how many dimensions can people have in a joystick? do you
travel to other universes with that thing?
[apparently more than 10...?!]
(reported on irc by DrewZzz)
author | rfelker |
---|---|
date | Fri, 31 Mar 2006 04:56:09 +0000 |
parents | 3ff863e54b93 |
children | d75953576ae4 |
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 { | |
183 mp_msg( MSGT_VO, MSGL_ERR, "[xv] " MSGTR_VO_XV_ImagedimTooHigh, | |
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 |
12582 | 193 vo_dx = (vo_screenwidth - d_width) / 2; |
194 vo_dy = (vo_screenheight - d_height) / 2; | |
195 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, | |
196 vo_screenheight); | |
197 vo_dwidth = d_width; | |
198 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
|
199 |
4978 | 200 #ifdef HAVE_XF86VM |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
15192
diff
changeset
|
201 if (flags & VOFLAG_MODESWITCHING) |
12582 | 202 vm = 1; |
4978 | 203 #endif |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
15192
diff
changeset
|
204 flip_flag = flags & VOFLAG_FLIPPING; |
12582 | 205 num_buffers = |
206 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
|
207 |
12582 | 208 /* check image formats */ |
209 { | |
210 unsigned int i; | |
10855 | 211 |
12582 | 212 xv_format = 0; |
213 for (i = 0; i < formats; i++) | |
214 { | |
215 mp_msg(MSGT_VO, MSGL_V, | |
216 "Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id, | |
217 (char *) &fo[i].id, | |
218 (fo[i].format == XvPacked) ? "packed" : "planar"); | |
219 if (fo[i].id == format) | |
220 xv_format = fo[i].id; | |
221 } | |
222 if (!xv_format) | |
223 return -1; | |
224 } | |
225 aspect_save_screenres(vo_screenwidth, vo_screenheight); | |
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
|
226 |
1775 | 227 #ifdef HAVE_NEW_GUI |
12582 | 228 if (use_gui) |
229 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
|
230 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
231 #endif |
723 | 232 { |
12582 | 233 hint.x = vo_dx; |
234 hint.y = vo_dy; | |
235 aspect(&d_width, &d_height, A_NOZOOM); | |
236 hint.width = d_width; | |
237 hint.height = d_height; | |
238 #ifdef HAVE_XF86VM | |
239 if (vm) | |
240 { | |
241 if ((d_width == 0) && (d_height == 0)) | |
242 { | |
243 vm_width = image_width; | |
244 vm_height = image_height; | |
245 } else | |
246 { | |
247 vm_width = d_width; | |
248 vm_height = d_height; | |
249 } | |
250 vo_vm_switch(vm_width, vm_height, &modeline_width, | |
251 &modeline_height); | |
252 hint.x = (vo_screenwidth - modeline_width) / 2; | |
253 hint.y = (vo_screenheight - modeline_height) / 2; | |
254 hint.width = modeline_width; | |
255 hint.height = modeline_height; | |
256 aspect_save_screenres(modeline_width, modeline_height); | |
257 } else | |
258 #endif | |
259 if (vo_fs) | |
260 { | |
2054 | 261 #ifdef X11_FULLSCREEN |
12582 | 262 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
263 * aspect() is available through aspect.h for all vos. | |
264 * besides zooming should only be done with -zoom, | |
265 * but I leave the old -fs behaviour so users don't get | |
266 * irritated for now (and send lots o' mails ;) ::atmos | |
267 */ | |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
268 |
12582 | 269 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
|
270 #endif |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
271 |
12582 | 272 } |
5945 | 273 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for? |
12582 | 274 vo_dwidth = d_width; |
275 vo_dheight = d_height; | |
276 hint.flags = PPosition | PSize /* | PBaseSize */ ; | |
277 hint.base_width = hint.width; | |
278 hint.base_height = hint.height; | |
279 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), | |
280 &attribs); | |
281 depth = attribs.depth; | |
282 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) | |
283 depth = 24; | |
284 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); | |
723 | 285 |
12582 | 286 xswa.background_pixel = 0; |
14742 | 287 if (xv_ck_info.method == CK_METHOD_BACKGROUND) |
288 { | |
289 xswa.background_pixel = xv_colorkey; | |
290 } | |
12582 | 291 xswa.border_pixel = 0; |
292 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 293 |
12582 | 294 if (WinID >= 0) |
295 { | |
296 vo_window = WinID ? ((Window) WinID) : mRootWin; | |
297 if (WinID) | |
298 { | |
299 XUnmapWindow(mDisplay, vo_window); | |
300 XChangeWindowAttributes(mDisplay, vo_window, xswamask, | |
301 &xswa); | |
302 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
303 StructureNotifyMask | | |
304 KeyPressMask | | |
305 PropertyChangeMask | | |
306 PointerMotionMask | | |
307 ButtonPressMask | | |
308 ButtonReleaseMask | | |
309 ExposureMask); | |
310 XMapWindow(mDisplay, vo_window); | |
15540 | 311 XGetGeometry(mDisplay, vo_window, &mRoot, |
312 &drwX, &drwY, &vo_dwidth, &vo_dheight, | |
313 &drwBorderWidth, &drwDepth); | |
314 drwX = drwY = 0; // coordinates need to be local to the window | |
315 aspect_save_prescale(vo_dwidth, vo_dheight); | |
12582 | 316 } else |
317 { | |
318 drwX = vo_dx; | |
319 drwY = vo_dy; | |
320 } | |
321 } else if (vo_window == None) | |
322 { | |
323 vo_window = | |
324 vo_x11_create_smooth_window(mDisplay, mRootWin, | |
325 vinfo.visual, hint.x, hint.y, | |
326 hint.width, hint.height, depth, | |
327 CopyFromParent); | |
14742 | 328 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); |
3830 | 329 |
12582 | 330 vo_x11_classhint(mDisplay, vo_window, "xv"); |
331 vo_hidecursor(mDisplay, vo_window); | |
3830 | 332 |
12582 | 333 vo_x11_selectinput_witherr(mDisplay, vo_window, |
334 StructureNotifyMask | KeyPressMask | | |
335 PropertyChangeMask | ((WinID == 0) ? | |
336 0 | |
337 : | |
338 (PointerMotionMask | |
339 | | |
340 ButtonPressMask | |
341 | | |
342 ButtonReleaseMask | |
343 | | |
344 ExposureMask))); | |
345 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, | |
346 NULL, 0, &hint); | |
14797
05eab20de476
Always use vo_x11_sizehint function ( even when going fullscreen ) to
al
parents:
14782
diff
changeset
|
347 vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height, 0); |
12582 | 348 XMapWindow(mDisplay, vo_window); |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
15192
diff
changeset
|
349 if (flags & VOFLAG_FULLSCREEN) |
12582 | 350 vo_x11_fullscreen(); |
351 else | |
352 { | |
3990 | 353 #ifdef HAVE_XINERAMA |
12582 | 354 vo_x11_xinerama_move(mDisplay, vo_window); |
3990 | 355 #endif |
12582 | 356 } |
357 } else | |
358 { | |
359 // vo_fs set means we were already at fullscreen | |
360 vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height, 0); | |
361 if (!vo_fs) | |
362 XMoveResizeWindow(mDisplay, vo_window, hint.x, hint.y, | |
363 hint.width, hint.height); | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
15192
diff
changeset
|
364 if (flags & VOFLAG_FULLSCREEN && !vo_fs) |
12582 | 365 vo_x11_fullscreen(); // handle -fs on non-first file |
366 } | |
367 | |
9161 | 368 // vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); |
12582 | 369 |
370 if (vo_gc != None) | |
371 XFreeGC(mDisplay, vo_gc); | |
372 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | |
373 XSync(mDisplay, False); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
374 #ifdef HAVE_XF86VM |
12582 | 375 if (vm) |
376 { | |
377 /* Grab the mouse pointer in our window */ | |
378 if (vo_grabpointer) | |
379 XGrabPointer(mDisplay, vo_window, True, 0, | |
380 GrabModeAsync, GrabModeAsync, | |
381 vo_window, None, CurrentTime); | |
382 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
383 } | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
384 #endif |
12582 | 385 } |
386 | |
387 mp_msg(MSGT_VO, MSGL_V, "using Xvideo port %d for hw scaling\n", | |
388 xv_port); | |
1 | 389 |
12582 | 390 switch (xv_format) |
391 { | |
392 case IMGFMT_YV12: | |
393 case IMGFMT_I420: | |
394 case IMGFMT_IYUV: | |
395 draw_alpha_fnc = draw_alpha_yv12; | |
396 break; | |
397 case IMGFMT_YUY2: | |
398 case IMGFMT_YVYU: | |
399 draw_alpha_fnc = draw_alpha_yuy2; | |
400 break; | |
401 case IMGFMT_UYVY: | |
402 draw_alpha_fnc = draw_alpha_uyvy; | |
403 break; | |
404 default: | |
405 draw_alpha_fnc = draw_alpha_null; | |
406 } | |
182 | 407 |
12582 | 408 if (vo_config_count) |
409 for (current_buf = 0; current_buf < num_buffers; ++current_buf) | |
410 deallocate_xvimage(current_buf); | |
7757 | 411 |
12582 | 412 for (current_buf = 0; current_buf < num_buffers; ++current_buf) |
413 allocate_xvimage(current_buf); | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
414 |
12582 | 415 current_buf = 0; |
416 current_ip_buf = 0; | |
1 | 417 |
6764
7755d1d59394
fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents:
6760
diff
changeset
|
418 #if 0 |
12582 | 419 set_gamma_correction(); |
6764
7755d1d59394
fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents:
6760
diff
changeset
|
420 #endif |
1818 | 421 |
12582 | 422 aspect(&vo_dwidth, &vo_dheight, A_NOZOOM); |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
15192
diff
changeset
|
423 if (((flags & VOFLAG_FULLSCREEN) && (WinID <= 0)) || vo_fs) |
12582 | 424 { |
425 aspect(&vo_dwidth, &vo_dheight, A_ZOOM); | |
426 drwX = | |
427 (vo_screenwidth - | |
428 (vo_dwidth > | |
429 vo_screenwidth ? vo_screenwidth : vo_dwidth)) / 2; | |
430 drwY = | |
431 (vo_screenheight - | |
432 (vo_dheight > | |
433 vo_screenheight ? vo_screenheight : vo_dheight)) / 2; | |
434 vo_dwidth = | |
435 (vo_dwidth > vo_screenwidth ? vo_screenwidth : vo_dwidth); | |
436 vo_dheight = | |
437 (vo_dheight > vo_screenheight ? vo_screenheight : vo_dheight); | |
438 mp_msg(MSGT_VO, MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n", | |
439 drwX, drwY, vo_dwidth, vo_dheight); | |
440 } | |
6382
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6366
diff
changeset
|
441 |
12582 | 442 panscan_calc(); |
9381
007a1bdce1f4
reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents:
9326
diff
changeset
|
443 |
007a1bdce1f4
reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents:
9326
diff
changeset
|
444 #if 0 |
9161 | 445 #ifdef HAVE_SHM |
12582 | 446 if (Shmem_Flag) |
447 { | |
448 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
449 xvimage[current_buf], 0, 0, image_width, | |
450 image_height, drwX, drwY, 1, 1, False); | |
451 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
452 xvimage[current_buf], 0, 0, image_width, | |
453 image_height, drwX, drwY, vo_dwidth, | |
454 (vo_fs ? vo_dheight - 1 : vo_dheight), False); | |
455 } else | |
9161 | 456 #endif |
12582 | 457 { |
458 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
459 xvimage[current_buf], 0, 0, image_width, image_height, | |
460 drwX, drwY, 1, 1); | |
461 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
462 xvimage[current_buf], 0, 0, image_width, image_height, | |
463 drwX, drwY, vo_dwidth, | |
464 (vo_fs ? vo_dheight - 1 : vo_dheight)); | |
465 } | |
9381
007a1bdce1f4
reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents:
9326
diff
changeset
|
466 #endif |
12582 | 467 |
468 mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX, | |
469 drwY, vo_dwidth, vo_dheight); | |
5945 | 470 |
12582 | 471 if (vo_ontop) |
472 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 473 |
12582 | 474 return 0; |
1 | 475 } |
476 | |
182 | 477 static void allocate_xvimage(int foo) |
1 | 478 { |
12582 | 479 /* |
480 * allocate XvImages. FIXME: no error checking, without | |
481 * mit-shm this will bomb... trzing to fix ::atmos | |
482 */ | |
6416 | 483 #ifdef HAVE_SHM |
12582 | 484 if (mLocalDisplay && XShmQueryExtension(mDisplay)) |
485 Shmem_Flag = 1; | |
486 else | |
487 { | |
488 Shmem_Flag = 0; | |
489 mp_msg(MSGT_VO, MSGL_INFO, | |
490 "Shared memory not supported\nReverting to normal Xv\n"); | |
491 } | |
492 if (Shmem_Flag) | |
493 { | |
494 xvimage[foo] = | |
495 (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format, | |
496 NULL, image_width, image_height, | |
497 &Shminfo[foo]); | |
1 | 498 |
12582 | 499 Shminfo[foo].shmid = |
500 shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); | |
501 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); | |
502 Shminfo[foo].readOnly = False; | |
1 | 503 |
12582 | 504 xvimage[foo]->data = Shminfo[foo].shmaddr; |
505 XShmAttach(mDisplay, &Shminfo[foo]); | |
506 XSync(mDisplay, False); | |
507 shmctl(Shminfo[foo].shmid, IPC_RMID, 0); | |
508 } else | |
6416 | 509 #endif |
12582 | 510 { |
511 xvimage[foo] = | |
512 (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, | |
513 image_width, image_height); | |
514 xvimage[foo]->data = malloc(xvimage[foo]->data_size); | |
515 XSync(mDisplay, False); | |
516 } | |
517 memset(xvimage[foo]->data, 128, xvimage[foo]->data_size); | |
518 return; | |
1 | 519 } |
520 | |
1794 | 521 static void deallocate_xvimage(int foo) |
522 { | |
6416 | 523 #ifdef HAVE_SHM |
12582 | 524 if (Shmem_Flag) |
525 { | |
526 XShmDetach(mDisplay, &Shminfo[foo]); | |
527 shmdt(Shminfo[foo].shmaddr); | |
528 } else | |
6416 | 529 #endif |
12582 | 530 { |
531 free(xvimage[foo]->data); | |
532 } | |
533 XFree(xvimage[foo]); | |
534 | |
535 XSync(mDisplay, False); | |
536 return; | |
1794 | 537 } |
538 | |
14782 | 539 static inline void put_xvimage( XvImage * xvi ) |
540 { | |
541 #ifdef HAVE_SHM | |
542 if (Shmem_Flag) | |
543 { | |
544 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
545 xvi, 0, 0, image_width, | |
546 image_height, drwX - (vo_panscan_x >> 1), | |
547 drwY - (vo_panscan_y >> 1), vo_dwidth + vo_panscan_x, | |
548 vo_dheight + vo_panscan_y, | |
549 False); | |
550 } else | |
551 #endif | |
552 { | |
553 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
554 xvi, 0, 0, image_width, image_height, | |
555 drwX - (vo_panscan_x >> 1), drwY - (vo_panscan_y >> 1), | |
556 vo_dwidth + vo_panscan_x, | |
557 vo_dheight + vo_panscan_y); | |
558 } | |
559 } | |
560 | |
31 | 561 static void check_events(void) |
1 | 562 { |
12582 | 563 int e = vo_x11_check_events(mDisplay); |
564 | |
565 if (e & VO_EVENT_RESIZE) | |
566 { | |
567 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &vo_dwidth, | |
568 &vo_dheight, &drwBorderWidth, &drwDepth); | |
569 drwX = drwY = 0; | |
570 mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX, | |
571 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
|
572 |
12582 | 573 aspect(&dwidth, &dheight, A_NOZOOM); |
574 if (vo_fs) | |
575 { | |
576 aspect(&dwidth, &dheight, A_ZOOM); | |
577 drwX = | |
578 (vo_screenwidth - | |
579 (dwidth > vo_screenwidth ? vo_screenwidth : dwidth)) / 2; | |
580 drwY = | |
581 (vo_screenheight - | |
582 (dheight > | |
583 vo_screenheight ? vo_screenheight : dheight)) / 2; | |
584 vo_dwidth = | |
585 (dwidth > vo_screenwidth ? vo_screenwidth : dwidth); | |
586 vo_dheight = | |
587 (dheight > vo_screenheight ? vo_screenheight : dheight); | |
588 mp_msg(MSGT_VO, MSGL_V, | |
589 "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n", drwX, drwY, | |
590 vo_dwidth, vo_dheight); | |
591 } | |
592 } | |
1 | 593 |
14742 | 594 if (e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) |
595 { | |
15192 | 596 vo_xv_draw_colorkey(drwX - (vo_panscan_x >> 1), |
597 drwY - (vo_panscan_y >> 1), | |
598 vo_dwidth + vo_panscan_x - 1, | |
599 vo_dheight + vo_panscan_y - 1); | |
14742 | 600 } |
601 | |
12582 | 602 if ((e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) && int_pause) |
14782 | 603 { |
604 /* did we already draw a buffer */ | |
605 if ( visible_buf != -1 ) | |
606 { | |
607 /* redraw the last visible buffer */ | |
608 put_xvimage( xvimage[visible_buf] ); | |
609 } | |
610 } | |
1 | 611 } |
612 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
613 static void draw_osd(void) |
12582 | 614 { |
615 vo_draw_text(image_width - | |
616 image_width * vo_panscan_x / (vo_dwidth + vo_panscan_x), | |
617 image_height, draw_alpha_fnc); | |
618 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
619 |
182 | 620 static void flip_page(void) |
1 | 621 { |
14782 | 622 put_xvimage( xvimage[current_buf] ); |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6295
diff
changeset
|
623 |
14782 | 624 /* remember the currently visible buffer */ |
625 visible_buf = current_buf; | |
626 | |
12582 | 627 if (num_buffers > 1) |
628 { | |
629 current_buf = | |
630 vo_directrendering ? 0 : ((current_buf + 1) % num_buffers); | |
631 XFlush(mDisplay); | |
632 } else | |
633 XSync(mDisplay, False); | |
634 return; | |
1 | 635 } |
636 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
637 static int draw_slice(uint8_t * image[], int stride[], int w, int h, |
12582 | 638 int x, int y) |
1 | 639 { |
12582 | 640 uint8_t *dst; |
182 | 641 |
12582 | 642 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + |
643 xvimage[current_buf]->pitches[0] * y + x; | |
644 memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0], | |
645 stride[0]); | |
182 | 646 |
12582 | 647 x /= 2; |
648 y /= 2; | |
649 w /= 2; | |
650 h /= 2; | |
1 | 651 |
12582 | 652 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + |
653 xvimage[current_buf]->pitches[1] * y + x; | |
654 if (image_format != IMGFMT_YV12) | |
655 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], | |
656 stride[1]); | |
657 else | |
658 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], | |
659 stride[2]); | |
5316 | 660 |
12582 | 661 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + |
662 xvimage[current_buf]->pitches[2] * y + x; | |
663 if (image_format == IMGFMT_YV12) | |
664 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], | |
665 stride[1]); | |
666 else | |
667 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], | |
668 stride[2]); | |
6231 | 669 |
12582 | 670 return 0; |
1 | 671 } |
672 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
673 static int draw_frame(uint8_t * src[]) |
12582 | 674 { |
7684 | 675 printf("draw_frame() called!!!!!!"); |
676 return -1; | |
1 | 677 } |
678 | |
12582 | 679 static uint32_t draw_image(mp_image_t * mpi) |
680 { | |
681 if (mpi->flags & MP_IMGFLAG_DIRECT) | |
682 { | |
683 // direct rendering: | |
684 current_buf = (int) (mpi->priv); // hack! | |
685 return VO_TRUE; | |
6760 | 686 } |
12582 | 687 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) |
688 return VO_TRUE; // done | |
689 if (mpi->flags & MP_IMGFLAG_PLANAR) | |
690 { | |
691 draw_slice(mpi->planes, mpi->stride, mpi->w, mpi->h, 0, 0); | |
692 return VO_TRUE; | |
7684 | 693 } |
12582 | 694 if (mpi->flags & MP_IMGFLAG_YUV) |
695 { | |
696 // packed YUV: | |
697 memcpy_pic(xvimage[current_buf]->data + | |
698 xvimage[current_buf]->offsets[0], mpi->planes[0], | |
699 mpi->w * (mpi->bpp / 8), mpi->h, | |
700 xvimage[current_buf]->pitches[0], mpi->stride[0]); | |
701 return VO_TRUE; | |
7684 | 702 } |
12582 | 703 return VO_FALSE; // not (yet) supported |
6760 | 704 } |
705 | |
12582 | 706 static uint32_t get_image(mp_image_t * mpi) |
707 { | |
708 int buf = current_buf; // we shouldn't change current_buf unless we do DR! | |
709 | |
710 if (mpi->type == MP_IMGTYPE_STATIC && num_buffers > 1) | |
711 return VO_FALSE; // it is not static | |
712 if (mpi->imgfmt != image_format) | |
713 return VO_FALSE; // needs conversion :( | |
4980 | 714 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram |
12582 | 715 if (mpi->flags & MP_IMGFLAG_READABLE && |
716 (mpi->type == MP_IMGTYPE_IPB || mpi->type == MP_IMGTYPE_IP)) | |
717 { | |
718 // reference (I/P) frame of IP or IPB: | |
719 if (num_buffers < 2) | |
720 return VO_FALSE; // not enough | |
721 current_ip_buf ^= 1; | |
722 // for IPB with 2 buffers we can DR only one of the 2 P frames: | |
723 if (mpi->type == MP_IMGTYPE_IPB && num_buffers < 3 | |
724 && current_ip_buf) | |
725 return VO_FALSE; | |
726 buf = current_ip_buf; | |
727 if (mpi->type == MP_IMGTYPE_IPB) | |
728 ++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
|
729 } |
12582 | 730 if (mpi->height > xvimage[buf]->height) |
731 return VO_FALSE; //buffer to small | |
732 if (mpi->width * (mpi->bpp / 8) > xvimage[buf]->pitches[0]) | |
733 return VO_FALSE; //buffer to small | |
734 if ((mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH)) | |
735 || (mpi->width * (mpi->bpp / 8) == xvimage[buf]->pitches[0])) | |
736 { | |
737 current_buf = buf; | |
738 mpi->planes[0] = | |
739 xvimage[current_buf]->data + xvimage[current_buf]->offsets[0]; | |
740 mpi->stride[0] = xvimage[current_buf]->pitches[0]; | |
741 mpi->width = mpi->stride[0] / (mpi->bpp / 8); | |
742 if (mpi->flags & MP_IMGFLAG_PLANAR) | |
743 { | |
744 if (mpi->flags & MP_IMGFLAG_SWAPPED) | |
745 { | |
746 // I420 | |
747 mpi->planes[1] = | |
748 xvimage[current_buf]->data + | |
749 xvimage[current_buf]->offsets[1]; | |
750 mpi->planes[2] = | |
751 xvimage[current_buf]->data + | |
752 xvimage[current_buf]->offsets[2]; | |
753 mpi->stride[1] = xvimage[current_buf]->pitches[1]; | |
754 mpi->stride[2] = xvimage[current_buf]->pitches[2]; | |
755 } else | |
756 { | |
757 // YV12 | |
758 mpi->planes[1] = | |
759 xvimage[current_buf]->data + | |
760 xvimage[current_buf]->offsets[2]; | |
761 mpi->planes[2] = | |
762 xvimage[current_buf]->data + | |
763 xvimage[current_buf]->offsets[1]; | |
764 mpi->stride[1] = xvimage[current_buf]->pitches[2]; | |
765 mpi->stride[2] = xvimage[current_buf]->pitches[1]; | |
766 } | |
767 } | |
768 mpi->flags |= MP_IMGFLAG_DIRECT; | |
769 mpi->priv = (void *) current_buf; | |
770 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n"); | |
771 return VO_TRUE; | |
4980 | 772 } |
773 return VO_FALSE; | |
774 } | |
775 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
776 static int query_format(uint32_t format) |
1 | 777 { |
10855 | 778 uint32_t i; |
12582 | 779 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 |
780 | |
781 /* check image formats */ | |
782 for (i = 0; i < formats; i++) | |
783 { | |
784 if (fo[i].id == format) | |
785 return flag; //xv_format = fo[i].id; | |
786 } | |
787 return 0; | |
1 | 788 } |
789 | |
12582 | 790 static void uninit(void) |
1852 | 791 { |
12582 | 792 int i; |
793 | |
794 if (!vo_config_count) | |
795 return; | |
14782 | 796 visible_buf = -1; |
12582 | 797 XvFreeAdaptorInfo(ai); |
798 ai = NULL; | |
13953 | 799 if(fo){ |
800 XFree(fo); | |
801 fo=NULL; | |
802 } | |
12582 | 803 for (i = 0; i < num_buffers; i++) |
804 deallocate_xvimage(i); | |
6016 | 805 #ifdef HAVE_XF86VM |
12582 | 806 vo_vm_close(mDisplay); |
6016 | 807 #endif |
12582 | 808 vo_x11_uninit(); |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
809 } |
1 | 810 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
811 static int preinit(const char *arg) |
4352 | 812 { |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
813 XvPortID xv_p; |
12582 | 814 int busy_ports = 0; |
10855 | 815 unsigned int i; |
14742 | 816 strarg_t ck_src_arg = { 0, NULL }; |
817 strarg_t ck_method_arg = { 0, NULL }; | |
818 | |
819 opt_t subopts[] = | |
820 { | |
821 /* name arg type arg var test */ | |
822 { "port", OPT_ARG_INT, &xv_port, (opt_test_f)int_pos }, | |
823 { "ck", OPT_ARG_STR, &ck_src_arg, xv_test_ck }, | |
824 { "ck-method", OPT_ARG_STR, &ck_method_arg, xv_test_ckm }, | |
825 { NULL } | |
826 }; | |
12582 | 827 |
10826 | 828 xv_port = 0; |
829 | |
14742 | 830 /* parse suboptions */ |
831 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
|
832 { |
14742 | 833 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
|
834 } |
14742 | 835 |
836 /* modify colorkey settings according to the given options */ | |
837 xv_setup_colorkeyhandling( ck_method_arg.str, ck_src_arg.str ); | |
838 | |
12582 | 839 if (!vo_init()) |
840 return -1; | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
841 |
12582 | 842 /* check for Xvideo extension */ |
843 if (Success != XvQueryExtension(mDisplay, &ver, &rel, &req, &ev, &err)) | |
844 { | |
845 mp_msg(MSGT_VO, MSGL_ERR, | |
846 "Sorry, Xv not supported by this X11 version/driver\n"); | |
847 mp_msg(MSGT_VO, MSGL_ERR, | |
848 "******** Try with -vo x11 or -vo sdl *********\n"); | |
849 return -1; | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
850 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
851 |
12582 | 852 /* check for Xvideo support */ |
853 if (Success != | |
854 XvQueryAdaptors(mDisplay, DefaultRootWindow(mDisplay), &adaptors, | |
855 &ai)) | |
856 { | |
857 mp_msg(MSGT_VO, MSGL_ERR, "Xv: XvQueryAdaptors failed\n"); | |
858 return -1; | |
859 } | |
860 | |
861 /* check adaptors */ | |
862 if (xv_port) | |
863 { | |
10839 | 864 int port_found; |
12582 | 865 |
866 for (port_found = 0, i = 0; !port_found && i < adaptors; i++) | |
867 { | |
868 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) | |
869 { | |
870 for (xv_p = ai[i].base_id; | |
871 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p) | |
872 { | |
873 if (xv_p == xv_port) | |
874 { | |
10839 | 875 port_found = 1; |
876 break; | |
877 } | |
878 } | |
879 } | |
880 } | |
12582 | 881 if (port_found) |
882 { | |
10839 | 883 if (XvGrabPort(mDisplay, xv_port, CurrentTime)) |
884 xv_port = 0; | |
12582 | 885 } else |
886 { | |
887 mp_msg(MSGT_VO, MSGL_WARN, | |
888 "Xv: Invalid port parameter, overriding with port 0\n"); | |
10839 | 889 xv_port = 0; |
890 } | |
10826 | 891 } |
12582 | 892 |
893 for (i = 0; i < adaptors && xv_port == 0; i++) | |
894 { | |
895 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) | |
896 { | |
897 for (xv_p = ai[i].base_id; | |
898 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p) | |
899 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) | |
900 { | |
901 xv_port = xv_p; | |
902 break; | |
903 } else | |
904 { | |
905 mp_msg(MSGT_VO, MSGL_WARN, | |
906 "Xv: could not grab port %i\n", (int) xv_p); | |
907 ++busy_ports; | |
908 } | |
909 } | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
910 } |
12582 | 911 if (!xv_port) |
912 { | |
913 if (busy_ports) | |
914 mp_msg(MSGT_VO, MSGL_ERR, | |
915 "Could not find free Xvideo port - maybe another process is already using it.\n" | |
916 "Close all video applications, and try again. If that does not help,\n" | |
917 "see 'mplayer -vo help' for other (non-xv) video out drivers.\n"); | |
918 else | |
919 mp_msg(MSGT_VO, MSGL_ERR, | |
920 "It seems there is no Xvideo support for your video card available.\n" | |
13914 | 921 "Run 'xvinfo' to verify its Xv support and read DOCS/HTML/en/video.html#xv!\n" |
12582 | 922 "See 'mplayer -vo help' for other (non-xv) video out drivers. Try -vo x11\n"); |
923 return -1; | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
924 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
925 |
14742 | 926 if ( !vo_xv_init_colorkey() ) |
7857
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
927 { |
14742 | 928 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
|
929 } |
15826
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15540
diff
changeset
|
930 vo_xv_enable_vsync(); |
16958 | 931 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
|
932 |
12582 | 933 fo = XvListImageFormats(mDisplay, xv_port, (int *) &formats); |
5566 | 934 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
935 return 0; |
4352 | 936 } |
1 | 937 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
938 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
|
939 { |
12582 | 940 switch (request) |
941 { | |
942 case VOCTRL_PAUSE: | |
943 return (int_pause = 1); | |
944 case VOCTRL_RESUME: | |
945 return (int_pause = 0); | |
946 case VOCTRL_QUERY_FORMAT: | |
947 return query_format(*((uint32_t *) data)); | |
948 case VOCTRL_GET_IMAGE: | |
949 return get_image(data); | |
950 case VOCTRL_DRAW_IMAGE: | |
951 return draw_image(data); | |
952 case VOCTRL_GUISUPPORT: | |
953 return VO_TRUE; | |
954 case VOCTRL_GET_PANSCAN: | |
955 if (!vo_config_count || !vo_fs) | |
956 return VO_FALSE; | |
957 return VO_TRUE; | |
958 case VOCTRL_FULLSCREEN: | |
959 vo_x11_fullscreen(); | |
960 /* indended, fallthrough to update panscan on fullscreen/windowed switch */ | |
961 case VOCTRL_SET_PANSCAN: | |
962 if ((vo_fs && (vo_panscan != vo_panscan_amount)) | |
963 || (!vo_fs && vo_panscan_amount)) | |
964 { | |
965 int old_y = vo_panscan_y; | |
966 | |
967 panscan_calc(); | |
968 | |
969 if (old_y != vo_panscan_y) | |
970 { | |
971 vo_x11_clearwindow_part(mDisplay, vo_window, | |
972 vo_dwidth + vo_panscan_x - 1, | |
973 vo_dheight + vo_panscan_y - 1, | |
974 1); | |
15190 | 975 vo_xv_draw_colorkey(drwX - (vo_panscan_x >> 1), |
976 drwY - (vo_panscan_y >> 1), | |
977 vo_dwidth + vo_panscan_x - 1, | |
978 vo_dheight + vo_panscan_y - 1); | |
12582 | 979 flip_page(); |
980 } | |
981 } | |
982 return VO_TRUE; | |
983 case VOCTRL_SET_EQUALIZER: | |
984 { | |
985 va_list ap; | |
986 int value; | |
987 | |
988 va_start(ap, data); | |
989 value = va_arg(ap, int); | |
990 | |
991 va_end(ap); | |
992 | |
993 return (vo_xv_set_eq(xv_port, data, value)); | |
994 } | |
995 case VOCTRL_GET_EQUALIZER: | |
996 { | |
997 va_list ap; | |
998 int *value; | |
999 | |
1000 va_start(ap, data); | |
1001 value = va_arg(ap, int *); | |
1002 | |
1003 va_end(ap); | |
1004 | |
1005 return (vo_xv_get_eq(xv_port, data, value)); | |
1006 } | |
1007 case VOCTRL_ONTOP: | |
1008 vo_x11_ontop(); | |
1009 return VO_TRUE; | |
1010 } | |
1011 return VO_NOTIMPL; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
1012 } |