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