Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 31313:b080b729c958
Indentation fix.
author | reimar |
---|---|
date | Sun, 13 Jun 2010 11:38:18 +0000 |
parents | 77bdb012aaae |
children | ad274a5b093b |
rev | line source |
---|---|
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
1 /* |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
2 * X11 Xv interface |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
3 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
4 * This file is part of MPlayer. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
5 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
6 * MPlayer is free software; you can redistribute it and/or modify |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
7 * it under the terms of the GNU General Public License as published by |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
8 * the Free Software Foundation; either version 2 of the License, or |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
9 * (at your option) any later version. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
10 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
11 * MPlayer is distributed in the hope that it will be useful, |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
14 * GNU General Public License for more details. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
15 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
16 * You should have received a copy of the GNU General Public License along |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
17 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28250
diff
changeset
|
19 */ |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
20 |
1265 | 21 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_ |
22 // 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
|
23 #define NUM_BUFFERS 3 |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
24 |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
25 /* |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
26 Buffer allocation: |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
27 |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
28 -nodr: |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
29 1: TEMP |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
30 2: 2*TEMP |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
31 |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
32 -dr: |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
33 1: TEMP |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
34 3: 2*STATIC+TEMP |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
35 */ |
ecc71f27bfd7
DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents:
6755
diff
changeset
|
36 |
1 | 37 #include <stdio.h> |
38 #include <stdlib.h> | |
39 #include <string.h> | |
40 | |
41 #include "config.h" | |
5935 | 42 #include "mp_msg.h" |
16958 | 43 #include "help_mp.h" |
1 | 44 #include "video_out.h" |
45 #include "video_out_internal.h" | |
46 | |
47 | |
48 #include <X11/Xlib.h> | |
49 #include <X11/Xutil.h> | |
50 #include <errno.h> | |
51 | |
31 | 52 #include "x11_common.h" |
53 | |
354 | 54 #include "fastmemcpy.h" |
616 | 55 #include "sub.h" |
2054 | 56 #include "aspect.h" |
350 | 57 |
14742 | 58 #include "subopt-helper.h" |
59 | |
24133 | 60 #include "input/input.h" |
61 | |
27343 | 62 #ifdef CONFIG_GUI |
23077 | 63 #include "gui/interface.h" |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
64 #endif |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
65 |
25963 | 66 #include "libavutil/common.h" |
22461
c54ad95f852a
Factor out some duplicated code in vo_xv and vo_xvmc
reimar
parents:
22232
diff
changeset
|
67 |
25216 | 68 static const vo_info_t info = { |
12582 | 69 "X11/Xv", |
70 "xv", | |
71 "Gerd Knorr <kraxel@goldbach.in-berlin.de> and others", | |
72 "" | |
1 | 73 }; |
74 | |
25220
c9e9ac2008c2
Mark the vo_functions_t definitions as const where possible.
reimar
parents:
25216
diff
changeset
|
75 const LIBVO_EXTERN(xv) |
6719
5291d74a60c9
xv support under cygwin - patch by Sycotic Smith <sycotic at linuxmail.org>
alex
parents:
6417
diff
changeset
|
76 #ifdef HAVE_SHM |
1 | 77 #include <sys/ipc.h> |
78 #include <sys/shm.h> | |
79 #include <X11/extensions/XShm.h> | |
6416 | 80 |
81 static XShmSegmentInfo Shminfo[NUM_BUFFERS]; | |
6417
44bca09c1edd
100l accidently removed a line too much (Shmem_Flag)
atmos4
parents:
6416
diff
changeset
|
82 static int Shmem_Flag; |
6416 | 83 #endif |
84 | |
10855 | 85 // Note: depends on the inclusion of X11/extensions/XShm.h |
86 #include <X11/extensions/Xv.h> | |
87 #include <X11/extensions/Xvlib.h> | |
88 | |
89 // FIXME: dynamically allocate this stuff | |
90 static void allocate_xvimage(int); | |
12582 | 91 static unsigned int ver, rel, req, ev, err; |
14742 | 92 static unsigned int formats, adaptors, xv_format; |
12582 | 93 static XvAdaptorInfo *ai = NULL; |
13953 | 94 static XvImageFormatValues *fo=NULL; |
10855 | 95 |
12582 | 96 static int current_buf = 0; |
97 static int current_ip_buf = 0; | |
98 static int num_buffers = 1; // default | |
14782 | 99 static int visible_buf = -1; // -1 means: no buffer was drawn yet |
12582 | 100 static XvImage *xvimage[NUM_BUFFERS]; |
10855 | 101 |
102 | |
1 | 103 static uint32_t image_width; |
104 static uint32_t image_height; | |
105 static uint32_t image_format; | |
106 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10359
diff
changeset
|
107 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
|
108 |
28511
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
109 static struct vo_rect src_rect; |
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
110 static struct vo_rect dst_rect; |
16958 | 111 static uint32_t max_width = 0, max_height = 0; // zero means: not set |
1 | 112 |
12582 | 113 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h, |
114 unsigned char *src, unsigned char *srca, | |
115 int stride); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
116 |
31231
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
117 static void fixup_osd_position(int *x0, int *y0, int *w, int *h) |
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
118 { |
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
119 *x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); |
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
120 *w = av_clip(*w, 0, image_width); |
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
121 *h = av_clip(*h, 0, image_height); |
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
122 *x0 = FFMIN(*x0, image_width - *w); |
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
123 *y0 = FFMIN(*y0, image_height - *h); |
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
124 } |
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
125 |
12582 | 126 static void draw_alpha_yv12(int x0, int y0, int w, int h, |
127 unsigned char *src, unsigned char *srca, | |
128 int stride) | |
129 { | |
31231
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
130 fixup_osd_position(&x0, &y0, &w, &h); |
12582 | 131 vo_draw_alpha_yv12(w, h, src, srca, stride, |
132 xvimage[current_buf]->data + | |
133 xvimage[current_buf]->offsets[0] + | |
134 xvimage[current_buf]->pitches[0] * y0 + x0, | |
135 xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
136 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
137 |
12582 | 138 static void draw_alpha_yuy2(int x0, int y0, int w, int h, |
139 unsigned char *src, unsigned char *srca, | |
140 int stride) | |
141 { | |
31231
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
142 fixup_osd_position(&x0, &y0, &w, &h); |
12582 | 143 vo_draw_alpha_yuy2(w, h, src, srca, stride, |
144 xvimage[current_buf]->data + | |
145 xvimage[current_buf]->offsets[0] + | |
146 xvimage[current_buf]->pitches[0] * y0 + 2 * x0, | |
147 xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
148 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
149 |
12582 | 150 static void draw_alpha_uyvy(int x0, int y0, int w, int h, |
151 unsigned char *src, unsigned char *srca, | |
152 int stride) | |
153 { | |
31231
77bdb012aaae
Factor out some common code and ensure we will not try to draw OSD
reimar
parents:
30122
diff
changeset
|
154 fixup_osd_position(&x0, &y0, &w, &h); |
12582 | 155 vo_draw_alpha_yuy2(w, h, src, srca, stride, |
156 xvimage[current_buf]->data + | |
157 xvimage[current_buf]->offsets[0] + | |
158 xvimage[current_buf]->pitches[0] * y0 + 2 * x0 + 1, | |
159 xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
160 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
161 |
12582 | 162 static void draw_alpha_null(int x0, int y0, int w, int h, |
163 unsigned char *src, unsigned char *srca, | |
164 int stride) | |
165 { | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
166 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
167 |
6786 | 168 |
7757 | 169 static void deallocate_xvimage(int foo); |
170 | |
28511
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
171 static void resize(void) |
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
172 { |
28598
4172d83194f2
Extend calc_src_dst_rects to also calculate the border values needed for
reimar
parents:
28511
diff
changeset
|
173 calc_src_dst_rects(image_width, image_height, &src_rect, &dst_rect, NULL, NULL); |
28511
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
174 vo_x11_clearwindow_part(mDisplay, vo_window, dst_rect.width, dst_rect.height, 1); |
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
175 vo_xv_draw_colorkey(dst_rect.left, dst_rect.top, dst_rect.width, dst_rect.height); |
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
176 } |
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
177 |
182 | 178 /* |
179 * connect to server, create and map window, | |
1 | 180 * allocate colors and (shared) memory |
181 */ | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
182 static int config(uint32_t width, uint32_t height, uint32_t d_width, |
12582 | 183 uint32_t d_height, uint32_t flags, char *title, |
184 uint32_t format) | |
1 | 185 { |
12582 | 186 XVisualInfo vinfo; |
187 XSetWindowAttributes xswa; | |
188 XWindowAttributes attribs; | |
189 unsigned long xswamask; | |
190 int depth; | |
191 | |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
192 #ifdef CONFIG_XF86VM |
27952
94bab93a8d17
Simplify handling of VOFLAG_MODESWITCHNG, merge assignment and declaration
reimar
parents:
27951
diff
changeset
|
193 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
|
194 #endif |
1 | 195 |
12582 | 196 image_height = height; |
197 image_width = width; | |
198 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
|
199 |
16958 | 200 if ((max_width != 0 && max_height != 0) && |
201 (image_width > max_width || image_height > max_height)) | |
202 { | |
20765 | 203 mp_msg( MSGT_VO, MSGL_ERR, MSGTR_VO_XV_ImagedimTooHigh, |
16958 | 204 image_width, image_height, max_width, max_height); |
205 return -1; | |
206 } | |
207 | |
12582 | 208 int_pause = 0; |
14782 | 209 visible_buf = -1; |
1 | 210 |
12582 | 211 num_buffers = |
212 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
|
213 |
12582 | 214 /* check image formats */ |
215 { | |
216 unsigned int i; | |
10855 | 217 |
12582 | 218 xv_format = 0; |
219 for (i = 0; i < formats; i++) | |
220 { | |
221 mp_msg(MSGT_VO, MSGL_V, | |
222 "Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id, | |
223 (char *) &fo[i].id, | |
224 (fo[i].format == XvPacked) ? "packed" : "planar"); | |
225 if (fo[i].id == format) | |
226 xv_format = fo[i].id; | |
227 } | |
228 if (!xv_format) | |
229 return -1; | |
230 } | |
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
|
231 |
27343 | 232 #ifdef CONFIG_GUI |
12582 | 233 if (use_gui) |
27878 | 234 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
|
235 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
236 #endif |
723 | 237 { |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
238 #ifdef CONFIG_XF86VM |
12582 | 239 if (vm) |
240 { | |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
241 vo_vm_switch(); |
27895
69b4b8d73b5e
Remove a nonsensical "else" for the video mode switching case.
reimar
parents:
27892
diff
changeset
|
242 } |
12582 | 243 #endif |
244 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), | |
245 &attribs); | |
246 depth = attribs.depth; | |
247 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) | |
248 depth = 24; | |
249 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); | |
723 | 250 |
12582 | 251 xswa.background_pixel = 0; |
14742 | 252 if (xv_ck_info.method == CK_METHOD_BACKGROUND) |
253 { | |
254 xswa.background_pixel = xv_colorkey; | |
255 } | |
12582 | 256 xswa.border_pixel = 0; |
257 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 258 |
27891
8742bcad99b5
Use vo_dwidth/vo_dheight for creating the windows instead of d_width/d_height.
reimar
parents:
27890
diff
changeset
|
259 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
|
260 flags, CopyFromParent, "xv", title); |
00aa61cde84a
Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents:
23077
diff
changeset
|
261 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); |
12582 | 262 |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
263 #ifdef CONFIG_XF86VM |
12582 | 264 if (vm) |
265 { | |
266 /* Grab the mouse pointer in our window */ | |
267 if (vo_grabpointer) | |
268 XGrabPointer(mDisplay, vo_window, True, 0, | |
269 GrabModeAsync, GrabModeAsync, | |
270 vo_window, None, CurrentTime); | |
271 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
272 } | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
273 #endif |
12582 | 274 } |
275 | |
276 mp_msg(MSGT_VO, MSGL_V, "using Xvideo port %d for hw scaling\n", | |
277 xv_port); | |
1 | 278 |
12582 | 279 switch (xv_format) |
280 { | |
281 case IMGFMT_YV12: | |
282 case IMGFMT_I420: | |
283 case IMGFMT_IYUV: | |
284 draw_alpha_fnc = draw_alpha_yv12; | |
285 break; | |
286 case IMGFMT_YUY2: | |
287 case IMGFMT_YVYU: | |
288 draw_alpha_fnc = draw_alpha_yuy2; | |
289 break; | |
290 case IMGFMT_UYVY: | |
291 draw_alpha_fnc = draw_alpha_uyvy; | |
292 break; | |
293 default: | |
294 draw_alpha_fnc = draw_alpha_null; | |
295 } | |
182 | 296 |
12582 | 297 if (vo_config_count) |
298 for (current_buf = 0; current_buf < num_buffers; ++current_buf) | |
299 deallocate_xvimage(current_buf); | |
7757 | 300 |
12582 | 301 for (current_buf = 0; current_buf < num_buffers; ++current_buf) |
302 allocate_xvimage(current_buf); | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
303 |
12582 | 304 current_buf = 0; |
305 current_ip_buf = 0; | |
1 | 306 |
28511
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
307 resize(); |
5945 | 308 |
12582 | 309 return 0; |
1 | 310 } |
311 | |
182 | 312 static void allocate_xvimage(int foo) |
1 | 313 { |
12582 | 314 /* |
315 * allocate XvImages. FIXME: no error checking, without | |
316 * mit-shm this will bomb... trzing to fix ::atmos | |
317 */ | |
6416 | 318 #ifdef HAVE_SHM |
12582 | 319 if (mLocalDisplay && XShmQueryExtension(mDisplay)) |
320 Shmem_Flag = 1; | |
321 else | |
322 { | |
323 Shmem_Flag = 0; | |
324 mp_msg(MSGT_VO, MSGL_INFO, | |
20765 | 325 MSGTR_LIBVO_XV_SharedMemoryNotSupported); |
12582 | 326 } |
327 if (Shmem_Flag) | |
328 { | |
329 xvimage[foo] = | |
330 (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format, | |
331 NULL, image_width, image_height, | |
332 &Shminfo[foo]); | |
1 | 333 |
12582 | 334 Shminfo[foo].shmid = |
335 shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); | |
336 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); | |
337 Shminfo[foo].readOnly = False; | |
1 | 338 |
12582 | 339 xvimage[foo]->data = Shminfo[foo].shmaddr; |
340 XShmAttach(mDisplay, &Shminfo[foo]); | |
341 XSync(mDisplay, False); | |
342 shmctl(Shminfo[foo].shmid, IPC_RMID, 0); | |
343 } else | |
6416 | 344 #endif |
12582 | 345 { |
346 xvimage[foo] = | |
347 (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, | |
348 image_width, image_height); | |
349 xvimage[foo]->data = malloc(xvimage[foo]->data_size); | |
350 XSync(mDisplay, False); | |
351 } | |
352 memset(xvimage[foo]->data, 128, xvimage[foo]->data_size); | |
353 return; | |
1 | 354 } |
355 | |
1794 | 356 static void deallocate_xvimage(int foo) |
357 { | |
6416 | 358 #ifdef HAVE_SHM |
12582 | 359 if (Shmem_Flag) |
360 { | |
361 XShmDetach(mDisplay, &Shminfo[foo]); | |
362 shmdt(Shminfo[foo].shmaddr); | |
363 } else | |
6416 | 364 #endif |
12582 | 365 { |
366 free(xvimage[foo]->data); | |
367 } | |
368 XFree(xvimage[foo]); | |
369 | |
370 XSync(mDisplay, False); | |
371 return; | |
1794 | 372 } |
373 | |
14782 | 374 static inline void put_xvimage( XvImage * xvi ) |
375 { | |
376 #ifdef HAVE_SHM | |
377 if (Shmem_Flag) | |
378 { | |
379 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
28511
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
380 xvi, |
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
381 src_rect.left, src_rect.top, src_rect.width, src_rect.height, |
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
382 dst_rect.left, dst_rect.top, dst_rect.width, dst_rect.height, |
14782 | 383 False); |
384 } else | |
385 #endif | |
386 { | |
387 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, | |
28511
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
388 xvi, |
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
389 src_rect.left, src_rect.top, src_rect.width, src_rect.height, |
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
390 dst_rect.left, dst_rect.top, dst_rect.width, dst_rect.height); |
14782 | 391 } |
392 } | |
393 | |
31 | 394 static void check_events(void) |
1 | 395 { |
12582 | 396 int e = vo_x11_check_events(mDisplay); |
397 | |
14742 | 398 if (e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) |
399 { | |
28511
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
400 resize(); |
14742 | 401 } |
402 | |
12582 | 403 if ((e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) && int_pause) |
14782 | 404 { |
405 /* did we already draw a buffer */ | |
406 if ( visible_buf != -1 ) | |
407 { | |
408 /* redraw the last visible buffer */ | |
409 put_xvimage( xvimage[visible_buf] ); | |
410 } | |
411 } | |
1 | 412 } |
413 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
414 static void draw_osd(void) |
12582 | 415 { |
416 vo_draw_text(image_width - | |
417 image_width * vo_panscan_x / (vo_dwidth + vo_panscan_x), | |
418 image_height, draw_alpha_fnc); | |
419 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
420 |
182 | 421 static void flip_page(void) |
1 | 422 { |
14782 | 423 put_xvimage( xvimage[current_buf] ); |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6295
diff
changeset
|
424 |
14782 | 425 /* remember the currently visible buffer */ |
426 visible_buf = current_buf; | |
427 | |
12582 | 428 if (num_buffers > 1) |
429 { | |
430 current_buf = | |
431 vo_directrendering ? 0 : ((current_buf + 1) % num_buffers); | |
432 XFlush(mDisplay); | |
433 } else | |
434 XSync(mDisplay, False); | |
435 return; | |
1 | 436 } |
437 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
438 static int draw_slice(uint8_t * image[], int stride[], int w, int h, |
12582 | 439 int x, int y) |
1 | 440 { |
12582 | 441 uint8_t *dst; |
182 | 442 |
12582 | 443 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + |
444 xvimage[current_buf]->pitches[0] * y + x; | |
445 memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0], | |
446 stride[0]); | |
182 | 447 |
12582 | 448 x /= 2; |
449 y /= 2; | |
450 w /= 2; | |
451 h /= 2; | |
1 | 452 |
12582 | 453 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + |
454 xvimage[current_buf]->pitches[1] * y + x; | |
455 if (image_format != IMGFMT_YV12) | |
456 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], | |
457 stride[1]); | |
458 else | |
459 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], | |
460 stride[2]); | |
5316 | 461 |
12582 | 462 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + |
463 xvimage[current_buf]->pitches[2] * 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]); | |
6231 | 470 |
12582 | 471 return 0; |
1 | 472 } |
473 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
474 static int draw_frame(uint8_t * src[]) |
12582 | 475 { |
27883
96831cf06109
Remove code from unused and since ages deprecated draw_frame function.
reimar
parents:
27882
diff
changeset
|
476 return VO_ERROR; |
1 | 477 } |
478 | |
12582 | 479 static uint32_t draw_image(mp_image_t * mpi) |
480 { | |
481 if (mpi->flags & MP_IMGFLAG_DIRECT) | |
482 { | |
483 // direct rendering: | |
484 current_buf = (int) (mpi->priv); // hack! | |
485 return VO_TRUE; | |
6760 | 486 } |
12582 | 487 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) |
488 return VO_TRUE; // done | |
489 if (mpi->flags & MP_IMGFLAG_PLANAR) | |
490 { | |
491 draw_slice(mpi->planes, mpi->stride, mpi->w, mpi->h, 0, 0); | |
492 return VO_TRUE; | |
7684 | 493 } |
12582 | 494 if (mpi->flags & MP_IMGFLAG_YUV) |
495 { | |
496 // packed YUV: | |
497 memcpy_pic(xvimage[current_buf]->data + | |
498 xvimage[current_buf]->offsets[0], mpi->planes[0], | |
499 mpi->w * (mpi->bpp / 8), mpi->h, | |
500 xvimage[current_buf]->pitches[0], mpi->stride[0]); | |
501 return VO_TRUE; | |
7684 | 502 } |
12582 | 503 return VO_FALSE; // not (yet) supported |
6760 | 504 } |
505 | |
12582 | 506 static uint32_t get_image(mp_image_t * mpi) |
507 { | |
508 int buf = current_buf; // we shouldn't change current_buf unless we do DR! | |
509 | |
510 if (mpi->type == MP_IMGTYPE_STATIC && num_buffers > 1) | |
511 return VO_FALSE; // it is not static | |
512 if (mpi->imgfmt != image_format) | |
513 return VO_FALSE; // needs conversion :( | |
4980 | 514 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram |
12582 | 515 if (mpi->flags & MP_IMGFLAG_READABLE && |
516 (mpi->type == MP_IMGTYPE_IPB || mpi->type == MP_IMGTYPE_IP)) | |
517 { | |
518 // reference (I/P) frame of IP or IPB: | |
519 if (num_buffers < 2) | |
520 return VO_FALSE; // not enough | |
521 current_ip_buf ^= 1; | |
522 // for IPB with 2 buffers we can DR only one of the 2 P frames: | |
523 if (mpi->type == MP_IMGTYPE_IPB && num_buffers < 3 | |
524 && current_ip_buf) | |
525 return VO_FALSE; | |
526 buf = current_ip_buf; | |
527 if (mpi->type == MP_IMGTYPE_IPB) | |
528 ++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
|
529 } |
12582 | 530 if (mpi->height > xvimage[buf]->height) |
531 return VO_FALSE; //buffer to small | |
532 if (mpi->width * (mpi->bpp / 8) > xvimage[buf]->pitches[0]) | |
533 return VO_FALSE; //buffer to small | |
534 if ((mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH)) | |
535 || (mpi->width * (mpi->bpp / 8) == xvimage[buf]->pitches[0])) | |
536 { | |
537 current_buf = buf; | |
538 mpi->planes[0] = | |
539 xvimage[current_buf]->data + xvimage[current_buf]->offsets[0]; | |
540 mpi->stride[0] = xvimage[current_buf]->pitches[0]; | |
541 mpi->width = mpi->stride[0] / (mpi->bpp / 8); | |
542 if (mpi->flags & MP_IMGFLAG_PLANAR) | |
543 { | |
544 if (mpi->flags & MP_IMGFLAG_SWAPPED) | |
545 { | |
546 // I420 | |
547 mpi->planes[1] = | |
548 xvimage[current_buf]->data + | |
549 xvimage[current_buf]->offsets[1]; | |
550 mpi->planes[2] = | |
551 xvimage[current_buf]->data + | |
552 xvimage[current_buf]->offsets[2]; | |
553 mpi->stride[1] = xvimage[current_buf]->pitches[1]; | |
554 mpi->stride[2] = xvimage[current_buf]->pitches[2]; | |
555 } else | |
556 { | |
557 // YV12 | |
558 mpi->planes[1] = | |
559 xvimage[current_buf]->data + | |
560 xvimage[current_buf]->offsets[2]; | |
561 mpi->planes[2] = | |
562 xvimage[current_buf]->data + | |
563 xvimage[current_buf]->offsets[1]; | |
564 mpi->stride[1] = xvimage[current_buf]->pitches[2]; | |
565 mpi->stride[2] = xvimage[current_buf]->pitches[1]; | |
566 } | |
567 } | |
568 mpi->flags |= MP_IMGFLAG_DIRECT; | |
569 mpi->priv = (void *) current_buf; | |
570 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n"); | |
571 return VO_TRUE; | |
4980 | 572 } |
573 return VO_FALSE; | |
574 } | |
575 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
576 static int query_format(uint32_t format) |
1 | 577 { |
10855 | 578 uint32_t i; |
12582 | 579 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 |
580 | |
581 /* check image formats */ | |
582 for (i = 0; i < formats; i++) | |
583 { | |
584 if (fo[i].id == format) | |
585 return flag; //xv_format = fo[i].id; | |
586 } | |
587 return 0; | |
1 | 588 } |
589 | |
12582 | 590 static void uninit(void) |
1852 | 591 { |
12582 | 592 int i; |
593 | |
594 if (!vo_config_count) | |
595 return; | |
14782 | 596 visible_buf = -1; |
12582 | 597 XvFreeAdaptorInfo(ai); |
598 ai = NULL; | |
13953 | 599 if(fo){ |
600 XFree(fo); | |
601 fo=NULL; | |
602 } | |
12582 | 603 for (i = 0; i < num_buffers; i++) |
604 deallocate_xvimage(i); | |
27377
d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
diego
parents:
27343
diff
changeset
|
605 #ifdef CONFIG_XF86VM |
27890
a4e2700e9381
Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
reimar
parents:
27889
diff
changeset
|
606 vo_vm_close(); |
6016 | 607 #endif |
24133 | 608 mp_input_rm_event_fd(ConnectionNumber(mDisplay)); |
12582 | 609 vo_x11_uninit(); |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
610 } |
1 | 611 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
612 static int preinit(const char *arg) |
4352 | 613 { |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
614 XvPortID xv_p; |
12582 | 615 int busy_ports = 0; |
10855 | 616 unsigned int i; |
14742 | 617 strarg_t ck_src_arg = { 0, NULL }; |
618 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
|
619 int xv_adaptor = -1; |
14742 | 620 |
28828
56eee6ffba9b
Make data related to suboption parsing const in libvo
reimar
parents:
28598
diff
changeset
|
621 const opt_t subopts[] = |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28829
diff
changeset
|
622 { |
14742 | 623 /* name arg type arg var test */ |
30122
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
29526
diff
changeset
|
624 { "port", OPT_ARG_INT, &xv_port, int_pos }, |
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
29526
diff
changeset
|
625 { "adaptor", OPT_ARG_INT, &xv_adaptor, int_non_neg }, |
14742 | 626 { "ck", OPT_ARG_STR, &ck_src_arg, xv_test_ck }, |
627 { "ck-method", OPT_ARG_STR, &ck_method_arg, xv_test_ckm }, | |
628 { NULL } | |
629 }; | |
12582 | 630 |
10826 | 631 xv_port = 0; |
632 | |
14742 | 633 /* parse suboptions */ |
634 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
|
635 { |
14742 | 636 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
|
637 } |
14742 | 638 |
639 /* modify colorkey settings according to the given options */ | |
640 xv_setup_colorkeyhandling( ck_method_arg.str, ck_src_arg.str ); | |
641 | |
12582 | 642 if (!vo_init()) |
643 return -1; | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
644 |
12582 | 645 /* check for Xvideo extension */ |
646 if (Success != XvQueryExtension(mDisplay, &ver, &rel, &req, &ev, &err)) | |
647 { | |
648 mp_msg(MSGT_VO, MSGL_ERR, | |
20765 | 649 MSGTR_LIBVO_XV_XvNotSupportedByX11); |
12582 | 650 return -1; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
651 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
652 |
12582 | 653 /* check for Xvideo support */ |
654 if (Success != | |
655 XvQueryAdaptors(mDisplay, DefaultRootWindow(mDisplay), &adaptors, | |
656 &ai)) | |
657 { | |
20765 | 658 mp_msg(MSGT_VO, MSGL_ERR, MSGTR_LIBVO_XV_XvQueryAdaptorsFailed); |
12582 | 659 return -1; |
660 } | |
661 | |
662 /* check adaptors */ | |
663 if (xv_port) | |
664 { | |
10839 | 665 int port_found; |
12582 | 666 |
667 for (port_found = 0, i = 0; !port_found && i < adaptors; i++) | |
668 { | |
669 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) | |
670 { | |
671 for (xv_p = ai[i].base_id; | |
672 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p) | |
673 { | |
674 if (xv_p == xv_port) | |
675 { | |
10839 | 676 port_found = 1; |
677 break; | |
678 } | |
679 } | |
680 } | |
681 } | |
12582 | 682 if (port_found) |
683 { | |
10839 | 684 if (XvGrabPort(mDisplay, xv_port, CurrentTime)) |
685 xv_port = 0; | |
12582 | 686 } else |
687 { | |
688 mp_msg(MSGT_VO, MSGL_WARN, | |
20765 | 689 MSGTR_LIBVO_XV_InvalidPortParameter); |
10839 | 690 xv_port = 0; |
691 } | |
10826 | 692 } |
12582 | 693 |
694 for (i = 0; i < adaptors && xv_port == 0; i++) | |
695 { | |
26730
41794a5fb100
Add a new suboption to -vo xv and -vo xvmc that allows selection
ben
parents:
25963
diff
changeset
|
696 /* 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
|
697 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
|
698 continue; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28829
diff
changeset
|
699 |
12582 | 700 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) |
701 { | |
702 for (xv_p = ai[i].base_id; | |
703 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p) | |
704 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) | |
705 { | |
706 xv_port = xv_p; | |
27031
0f7770b2230d
Move message about which adapter is used to verbose mode.
diego
parents:
26755
diff
changeset
|
707 mp_msg(MSGT_VO, MSGL_V, |
0f7770b2230d
Move message about which adapter is used to verbose mode.
diego
parents:
26755
diff
changeset
|
708 "[VO_XV] Using Xv Adapter #%d (%s)\n", |
0f7770b2230d
Move message about which adapter is used to verbose mode.
diego
parents:
26755
diff
changeset
|
709 i, ai[i].name); |
12582 | 710 break; |
711 } else | |
712 { | |
713 mp_msg(MSGT_VO, MSGL_WARN, | |
20765 | 714 MSGTR_LIBVO_XV_CouldNotGrabPort, (int) xv_p); |
12582 | 715 ++busy_ports; |
716 } | |
717 } | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
718 } |
12582 | 719 if (!xv_port) |
720 { | |
721 if (busy_ports) | |
722 mp_msg(MSGT_VO, MSGL_ERR, | |
20765 | 723 MSGTR_LIBVO_XV_CouldNotFindFreePort); |
12582 | 724 else |
725 mp_msg(MSGT_VO, MSGL_ERR, | |
20765 | 726 MSGTR_LIBVO_XV_NoXvideoSupport); |
12582 | 727 return -1; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
728 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
729 |
14742 | 730 if ( !vo_xv_init_colorkey() ) |
7857
3c690d2ad1ac
MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents:
7848
diff
changeset
|
731 { |
14742 | 732 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
|
733 } |
15826
db966bdf6f5b
Try to set XV_SYNC_TO_VBLANK to enable vsync on non-overlay xv adapters.
reimar
parents:
15540
diff
changeset
|
734 vo_xv_enable_vsync(); |
16958 | 735 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
|
736 |
12582 | 737 fo = XvListImageFormats(mDisplay, xv_port, (int *) &formats); |
5566 | 738 |
24133 | 739 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
|
740 return 0; |
4352 | 741 } |
1 | 742 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15826
diff
changeset
|
743 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
|
744 { |
12582 | 745 switch (request) |
746 { | |
747 case VOCTRL_PAUSE: | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26730
diff
changeset
|
748 return int_pause = 1; |
12582 | 749 case VOCTRL_RESUME: |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26730
diff
changeset
|
750 return int_pause = 0; |
12582 | 751 case VOCTRL_QUERY_FORMAT: |
752 return query_format(*((uint32_t *) data)); | |
753 case VOCTRL_GET_IMAGE: | |
754 return get_image(data); | |
755 case VOCTRL_DRAW_IMAGE: | |
756 return draw_image(data); | |
757 case VOCTRL_GUISUPPORT: | |
758 return VO_TRUE; | |
759 case VOCTRL_GET_PANSCAN: | |
760 return VO_TRUE; | |
761 case VOCTRL_FULLSCREEN: | |
762 vo_x11_fullscreen(); | |
763 /* indended, fallthrough to update panscan on fullscreen/windowed switch */ | |
764 case VOCTRL_SET_PANSCAN: | |
28511
db19e31a2c7c
Add a calc_src_dst_rects that calculates from window size, panscan etc.
reimar
parents:
28446
diff
changeset
|
765 resize(); |
12582 | 766 return VO_TRUE; |
767 case VOCTRL_SET_EQUALIZER: | |
768 { | |
769 va_list ap; | |
770 int value; | |
771 | |
772 va_start(ap, data); | |
773 value = va_arg(ap, int); | |
774 | |
775 va_end(ap); | |
776 | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26730
diff
changeset
|
777 return vo_xv_set_eq(xv_port, data, value); |
12582 | 778 } |
779 case VOCTRL_GET_EQUALIZER: | |
780 { | |
781 va_list ap; | |
782 int *value; | |
783 | |
784 va_start(ap, data); | |
785 value = va_arg(ap, int *); | |
786 | |
787 va_end(ap); | |
788 | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
26730
diff
changeset
|
789 return vo_xv_get_eq(xv_port, data, value); |
12582 | 790 } |
791 case VOCTRL_ONTOP: | |
792 vo_x11_ontop(); | |
793 return VO_TRUE; | |
22232 | 794 case VOCTRL_UPDATE_SCREENINFO: |
795 update_xinerama_info(); | |
796 return VO_TRUE; | |
12582 | 797 } |
798 return VO_NOTIMPL; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
799 } |