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