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