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