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