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