annotate libvo/vo_xvidix.c @ 33273:8c4a81b0bd5f

Update Doxyfile from doxygen 1.3.7 to 1.5.6. The latter is the version available in Debian oldstable and should thus be a suitable baseline that can be expected to be available on all systems. The update makes new Doxygen features available in the configuration file and avoids several deprecation warnings when using newer doxygen versions.
author diego
date Wed, 04 May 2011 14:27:35 +0000
parents 8fa2f43cb760
children 899d817e56fc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
1 /*
28446
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
2 * VIDIX-accelerated overlay in an X window
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
3 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
4 * copyright (C) Alex Beregszaszi & Zoltan Ponekker & Nick Kurshev
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
5 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
6 * WS window manager by Pontscho/Fresh!
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
7 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
8 * based on vo_gl.c and vo_vesa.c and vo_xmga.c (.so mastah! ;))
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
9 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
10 * This file is part of MPlayer.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
11 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
12 * MPlayer is free software; you can redistribute it and/or modify
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
13 * it under the terms of the GNU General Public License as published by
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
14 * the Free Software Foundation; either version 2 of the License, or
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
15 * (at your option) any later version.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
16 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
17 * MPlayer is distributed in the hope that it will be useful,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
20 * GNU General Public License for more details.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
21 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
22 * You should have received a copy of the GNU General Public License along
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
23 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
24 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
25 */
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
26
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
27 #include <stdio.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
28 #include <stdlib.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
29 #include <string.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
30 #include <math.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
31 #include <errno.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
32
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
33 #include "config.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
34 #include "video_out.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
35 #include "video_out_internal.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
36
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
37 #include <X11/Xlib.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
38 #include <X11/Xutil.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
39 //#include <X11/keysym.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
40
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
41 #ifdef CONFIG_XINERAMA
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
42 #include <X11/extensions/Xinerama.h>
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
43 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
44
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
45 #include "x11_common.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
46 #include "aspect.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
47 #include "mp_msg.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
48
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
49 #include "vosub_vidix.h"
27079
df448e1248b2 remove now useless vidixlib.h file
ben
parents: 26755
diff changeset
50 #include "vidix/vidix.h"
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
51
25216
3aee342be929 Make vo info structs const
reimar
parents: 24159
diff changeset
52 static const vo_info_t info = {
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
53 "X11 (VIDIX)",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
54 "xvidix",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
55 "Alex Beregszaszi",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
56 ""
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
57 };
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
58
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
59 LIBVO_EXTERN(xvidix)
32336
09dd92639e7b Remove UNUSED macros used to shut up unused function parameter warnings.
diego
parents: 31315
diff changeset
60
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
61 /* X11 related variables */
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
62 /* Colorkey handling */
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
63 static int colorkey;
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
64 static vidix_grkey_t gr_key;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
65
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
66 /* VIDIX related */
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
67 static char *vidix_name;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
68
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
69 /* Image parameters */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
70 static uint32_t image_width;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
71 static uint32_t image_height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
72 static uint32_t image_format;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
73
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
74 /* Window parameters */
6299
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
75 static uint32_t window_x, window_y;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
76 static uint32_t window_width, window_height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
77
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
78 /* used by XGetGeometry & XTranslateCoordinates for moving/resizing window */
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
79 static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth,
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4805
diff changeset
80 drwDepth, drwcX, drwcY, dwidth, dheight;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
81
28051
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 27927
diff changeset
82 void set_video_eq(int cap);
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6649
diff changeset
83
8991
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
84
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
85 static void set_window(int force_update)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
86 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6043
diff changeset
87 Window mRoot;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
88
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
89 if (WinID)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
90 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
91 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &drwWidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
92 &drwHeight, &drwBorderWidth, &drwDepth);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
93 drwX = drwY = 0;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
94
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
95 XTranslateCoordinates(mDisplay, vo_window, mRoot, 0, 0,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
96 &drwcX, &drwcY, &mRoot);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
97 aspect(&dwidth, &dheight, A_NOZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
98 if (!vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
99 mp_msg(MSGT_VO, MSGL_V,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
100 "[xvidix] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
101 drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
102
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
103 /* following stuff copied from vo_xmga.c */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
104 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
105 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
106 aspect(&dwidth, &dheight, A_NOZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
107 drwcX = drwX = vo_dx;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
108 drwcY = drwY = vo_dy;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
109 drwWidth = vo_dwidth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
110 drwHeight = vo_dheight;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
111 }
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
112
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
113 #if X11_FULLSCREEN
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4805
diff changeset
114 if (vo_fs)
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
115 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
116 aspect(&dwidth, &dheight, A_ZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
117 drwX =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
118 (vo_screenwidth -
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
119 (dwidth > vo_screenwidth ? vo_screenwidth : dwidth)) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
120 drwcX = drwX;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
121 drwY =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
122 (vo_screenheight -
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
123 (dheight > vo_screenheight ? vo_screenheight : dheight)) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
124 drwcY = drwY;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
125 drwWidth = (dwidth > vo_screenwidth ? vo_screenwidth : dwidth);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
126 drwHeight =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
127 (dheight > vo_screenheight ? vo_screenheight : dheight);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
128 mp_msg(MSGT_VO, MSGL_V,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
129 "[xvidix-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
130 drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
131 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
132 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
133
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
134 vo_dwidth = drwWidth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
135 vo_dheight = drwHeight;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
136
27748
6b0875706a22 fixed overlay x and y calculation
faust3
parents: 27377
diff changeset
137 update_xinerama_info();
6b0875706a22 fixed overlay x and y calculation
faust3
parents: 27377
diff changeset
138 drwcX -= xinerama_x;
6b0875706a22 fixed overlay x and y calculation
faust3
parents: 27377
diff changeset
139 drwcY -= xinerama_y;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
140
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
141 if (vo_panscan > 0.0f && vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
142 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
143 drwcX -= vo_panscan_x >> 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
144 drwcY -= vo_panscan_y >> 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
145 drwX -= vo_panscan_x >> 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
146 drwY -= vo_panscan_y >> 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
147 drwWidth += vo_panscan_x;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
148 drwHeight += vo_panscan_y;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
149 }
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
150
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
151 /* set new values in VIDIX */
6299
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
152 if (force_update || (window_x != drwcX) || (window_y != drwcY) ||
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
153 (window_width != drwWidth) || (window_height != drwHeight))
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
154 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
155 // do a backup of window coordinates
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
156 window_x = drwcX;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
157 window_y = drwcY;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
158 vo_dx = drwcX;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
159 vo_dy = drwcY;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
160 window_width = drwWidth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
161 window_height = drwHeight;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4194
diff changeset
162
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
163 /* FIXME: implement runtime resize/move if possible, this way is very ugly! */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
164 vidix_stop();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
165 if (vidix_init(image_width, image_height, vo_dx, vo_dy,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
166 window_width, window_height, image_format,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
167 vo_depthonscreen, vo_screenwidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
168 vo_screenheight) != 0)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
169 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
170 mp_msg(MSGT_VO, MSGL_FATAL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
171 "Can't initialize VIDIX driver: %s\n", strerror(errno));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
172 abort();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
173 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
174 vidix_start();
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
175 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
176
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
177 mp_msg(MSGT_VO, MSGL_V,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
178 "[xvidix] window properties: pos: %dx%d, size: %dx%d\n", vo_dx,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
179 vo_dy, window_width, window_height);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
180
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
181 /* mDrawColorKey: */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
182
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
183 /* fill drawable with specified color */
11216
30eccb0d1a64 fixed -nocolorkey
alex
parents: 11158
diff changeset
184 if (!(vo_colorkey & 0xff000000))
11158
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
185 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
186 XSetBackground(mDisplay, vo_gc, 0L);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
187 XClearWindow(mDisplay, vo_window);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
188 XSetForeground(mDisplay, vo_gc, colorkey);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
189 XFillRectangle(mDisplay, vo_window, vo_gc, drwX, drwY, drwWidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
190 (vo_fs ? drwHeight - 1 : drwHeight));
11158
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
191 }
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
192 /* flush, update drawable */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
193 XFlush(mDisplay);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
194
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
195 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
196 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
197
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
198 /* connect to server, create and map window,
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
199 * allocate colors and (shared) memory
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
200 */
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
201 static int config(uint32_t width, uint32_t height, uint32_t d_width,
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
202 uint32_t d_height, uint32_t flags, char *title,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
203 uint32_t format)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
204 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
205 XVisualInfo vinfo;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
206
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7931
diff changeset
207 // XSizeHints hint;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
208 XSetWindowAttributes xswa;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
209 unsigned long xswamask;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
210 XWindowAttributes attribs;
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
211 int window_depth, r, g, b;
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
212
5738
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
213 title = "MPlayer VIDIX X11 Overlay";
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
214
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
215 image_height = height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
216 image_width = width;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
217 image_format = format;
4459
71b864031c3f Alex! Never write bottlenecks, ok?
nick
parents: 4441
diff changeset
218
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
219 window_width = d_width;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
220 window_height = d_height;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
221
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
222 // vo_fs = flags&0x01;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
223 // if (vo_fs)
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
224 // { vo_old_width=d_width; vo_old_height=d_height; }
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
225
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
226 r = (vo_colorkey & 0x00ff0000) >> 16;
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
227 g = (vo_colorkey & 0x0000ff00) >> 8;
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
228 b = vo_colorkey & 0x000000ff;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
229 switch (vo_depthonscreen)
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
230 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
231 case 32:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
232 colorkey = vo_colorkey;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
233 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
234 case 24:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
235 colorkey = vo_colorkey & 0x00ffffff;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
236 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
237 case 16:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
238 colorkey = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
239 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
240 case 15:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
241 colorkey = ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
242 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
243 default:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
244 mp_msg(MSGT_VO, MSGL_ERR,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
245 "Sorry, this (%d) color depth is not supported\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
246 vo_depthonscreen);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
247 }
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13787
diff changeset
248 mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
249
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
250 #ifdef X11_FULLSCREEN
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 13946
diff changeset
251 if ((flags & VOFLAG_FULLSCREEN) || (flags & VOFLAG_SWSCALE))
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
252 aspect(&d_width, &d_height, A_ZOOM);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
253 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
254 dwidth = d_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
255 dheight = d_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
256 /* Make the window */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
257 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
258 &attribs);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
259
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
260 /* from vo_x11 */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
261 window_depth = attribs.depth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
262 if ((window_depth != 15) && (window_depth != 16)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
263 && (window_depth != 24) && (window_depth != 32))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
264 window_depth = 24;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
265 XMatchVisualInfo(mDisplay, mScreen, window_depth, TrueColor,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
266 &vinfo);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
267
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
268 xswa.background_pixel = BlackPixel(mDisplay, mScreen);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
269 xswa.border_pixel = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
270 xswa.colormap =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
271 XCreateColormap(mDisplay, RootWindow(mDisplay, mScreen),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
272 vinfo.visual, AllocNone);
27927
6f199f065e15 Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents: 27903
diff changeset
273 xswamask = CWBackPixel | CWBorderPixel | CWColormap;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
274
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
275 vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
276 window_width, window_height, flags,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
277 CopyFromParent, "xvidix", title);
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
278 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
279
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 13946
diff changeset
280 if ((!WinID) && (flags & VOFLAG_FULLSCREEN))
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
281 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
282 vo_dx = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
283 vo_dy = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
284 vo_dwidth = vo_screenwidth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
285 vo_dheight = vo_screenheight;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
286 vo_fs = 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
287 }
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
288
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
289 if (vidix_grkey_support())
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
290 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
291 vidix_grkey_get(&gr_key);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
292 gr_key.key_op = KEYS_PUT;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
293 if (!(vo_colorkey & 0xff000000))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
294 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
295 gr_key.ckey.op = CKEY_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
296 gr_key.ckey.red = r;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
297 gr_key.ckey.green = g;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
298 gr_key.ckey.blue = b;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
299 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
300 gr_key.ckey.op = CKEY_FALSE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
301 vidix_grkey_set(&gr_key);
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
302 }
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
303
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
304 set_window(1);
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6649
diff changeset
305
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
306 XSync(mDisplay, False);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
307
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
308 panscan_calc();
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
309
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25216
diff changeset
310 return 0;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
311 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
312
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
313 static void check_events(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
314 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
315 const int event = vo_x11_check_events(mDisplay);
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
316
32371
ac7cc5583145 xvidix: reconfigure also on window move.
reimar
parents: 32336
diff changeset
317 if (event & (VO_EVENT_RESIZE | VO_EVENT_MOVE | VO_EVENT_EXPOSE))
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
318 set_window(0);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
319
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
320 return;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
321 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
322
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
323 /* draw_osd, flip_page, draw_slice, draw_frame should be
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
324 overwritten with vidix functions (vosub_vidix.c) */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
325 static void draw_osd(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
326 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
327 mp_msg(MSGT_VO, MSGL_FATAL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
328 "[xvidix] error: didn't used vidix draw_osd!\n");
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
329 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
330 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
331
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
332 static void flip_page(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
333 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
334 mp_msg(MSGT_VO, MSGL_FATAL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
335 "[xvidix] error: didn't used vidix flip_page!\n");
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
336 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
337 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
338
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
339 static int draw_slice(uint8_t * src[], int stride[],
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
340 int w, int h, int x, int y)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
341 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
342 mp_msg(MSGT_VO, MSGL_FATAL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
343 "[xvidix] error: didn't used vidix draw_slice!\n");
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25216
diff changeset
344 return -1;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
345 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
346
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
347 static int draw_frame(uint8_t * src[])
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
348 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
349 mp_msg(MSGT_VO, MSGL_FATAL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
350 "[xvidix] error: didn't used vidix draw_frame!\n");
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25216
diff changeset
351 return -1;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
352 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
353
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
354 static int query_format(uint32_t format)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
355 {
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25216
diff changeset
356 return vidix_query_fourcc(format);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
357 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
358
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
359 static void uninit(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
360 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
361 if (!vo_config_count)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
362 return;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
363 vidix_term();
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
364
32537
8fa2f43cb760 Remove most of the NULL pointer check before free all over the code
cboesch
parents: 32371
diff changeset
365 free(vidix_name);
8fa2f43cb760 Remove most of the NULL pointer check before free all over the code
cboesch
parents: 32371
diff changeset
366 vidix_name = NULL;
4441
90814d64a840 removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents: 4434
diff changeset
367
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6043
diff changeset
368 vo_x11_uninit();
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
369 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
370
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
371 static int preinit(const char *arg)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
372 {
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
373
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
374 if (arg)
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
375 vidix_name = strdup(arg);
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
376 else
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
377 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
378 mp_msg(MSGT_VO, MSGL_INFO,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
379 "No vidix driver name provided, probing available ones (-v option for details)!\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
380 vidix_name = NULL;
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
381 }
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
382
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
383 if (!vo_init())
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25216
diff changeset
384 return -1;
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
385
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
386 if (vidix_preinit(vidix_name, &video_out_xvidix) != 0)
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25216
diff changeset
387 return 1;
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
388
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25216
diff changeset
389 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
390 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
391
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
392 static int control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
393 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
394 switch (request)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
395 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
396 case VOCTRL_QUERY_FORMAT:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
397 return query_format(*((uint32_t *) data));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
398 case VOCTRL_GUISUPPORT:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
399 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
400 case VOCTRL_GET_PANSCAN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
401 if (!vo_config_count || !vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
402 return VO_FALSE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
403 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
404 case VOCTRL_ONTOP:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
405 vo_x11_ontop();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
406 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
407 case VOCTRL_FULLSCREEN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
408 vo_x11_fullscreen();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
409 case VOCTRL_SET_PANSCAN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
410 if (vo_fs && (vo_panscan != vo_panscan_amount))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
411 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
412 panscan_calc();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
413 set_window(0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
414 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
415 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
416 case VOCTRL_SET_EQUALIZER:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
417 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
418 va_list ap;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
419 int value;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
420
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
421 va_start(ap, data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
422 value = va_arg(ap, int);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
423
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
424 va_end(ap);
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
425
20110
d27e00bb61b8 Remove spurious casts to int. Blessed by Reimar.
rathann
parents: 18715
diff changeset
426 return vidix_control(request, data, value);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
427 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
428 case VOCTRL_GET_EQUALIZER:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
429 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
430 va_list ap;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
431 int *value;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
432
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
433 va_start(ap, data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
434 value = va_arg(ap, int *);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
435
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
436 va_end(ap);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
437
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
438 return vidix_control(request, data, value);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
439 }
22232
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 20110
diff changeset
440 case VOCTRL_UPDATE_SCREENINFO:
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 20110
diff changeset
441 aspect_save_screenres(vo_screenwidth, vo_screenheight);
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 20110
diff changeset
442 return VO_TRUE;
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 20110
diff changeset
443
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
444 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
445 return vidix_control(request, data);
6531
7bd342baa785 yvu9,if09,y8,y800 support and multifile fix
alex
parents: 6382
diff changeset
446 // return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
447 }