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