Mercurial > mplayer.hg
annotate libvo/vo_gl.c @ 14013:540512f82d0d
revert useless uyvy planar->packed converter
author | henry |
---|---|
date | Mon, 22 Nov 2004 10:22:31 +0000 |
parents | 9e331a5299b2 |
children | c4033dcb986f |
rev | line source |
---|---|
12843
52d493f0ac79
changed misleading TEXTUREFORMAT_32BPP (was 24bpp!) to vo_gl2 style TEXTUREFORMAT_ALWAYS
reimar
parents:
12749
diff
changeset
|
1 #define TEXTUREFORMAT_ALWAYS GL_RGB8 |
1 | 2 |
3 #include <stdio.h> | |
4 #include <stdlib.h> | |
5 #include <string.h> | |
6 #include <math.h> | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
7 #include <errno.h> |
1 | 8 |
11988 | 9 #include "mp_msg.h" |
1 | 10 #include "config.h" |
11 #include "video_out.h" | |
12 #include "video_out_internal.h" | |
13585 | 13 #include "font_load.h" |
14 #include "sub.h" | |
1 | 15 |
16 #include <X11/Xlib.h> | |
17 #include <X11/Xutil.h> | |
18 //#include <X11/keysym.h> | |
19 #include <GL/glx.h> | |
20 #include <errno.h> | |
21 | |
22 #include <GL/gl.h> | |
23 | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
24 #include "gl_common.h" |
31 | 25 #include "x11_common.h" |
2057 | 26 #include "aspect.h" |
13843 | 27 #ifdef HAVE_NEW_GUI |
28 #include "Gui/interface.h" | |
29 #endif | |
31 | 30 |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7931
diff
changeset
|
31 static vo_info_t info = |
1 | 32 { |
33 "X11 (OpenGL)", | |
34 "gl", | |
35 "Arpad Gereoffy <arpi@esp-team.scene.hu>", | |
36 "" | |
37 }; | |
38 | |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7931
diff
changeset
|
39 LIBVO_EXTERN(gl) |
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7931
diff
changeset
|
40 |
13843 | 41 static XVisualInfo *gl_vinfo = NULL; |
42 static GLXContext gl_context = 0; | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
43 static int wsGLXAttrib[] = { GLX_RGBA, |
1 | 44 GLX_RED_SIZE,1, |
45 GLX_GREEN_SIZE,1, | |
46 GLX_BLUE_SIZE,1, | |
47 GLX_DOUBLEBUFFER, | |
48 None }; | |
49 | |
13599 | 50 static int use_osd; |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
51 static int scaled_osd; |
13585 | 52 #define MAX_OSD_PARTS 20 |
13599 | 53 static GLuint osdtex[MAX_OSD_PARTS]; |
13585 | 54 #ifndef FAST_OSD |
13599 | 55 static GLuint osdatex[MAX_OSD_PARTS]; |
13585 | 56 #endif |
13599 | 57 static GLuint osdDispList[MAX_OSD_PARTS]; |
58 static int osdtexCnt = 0; | |
1 | 59 |
13601 | 60 static int use_aspect; |
1 | 61 static uint32_t image_width; |
62 static uint32_t image_height; | |
63 static uint32_t image_bytes; | |
12159 | 64 static int many_fmts; |
12445
d97398ed403e
changes to get manyfmts nearer to working and fixed memory leak
reimar
parents:
12212
diff
changeset
|
65 static GLenum gl_texfmt; |
12159 | 66 static GLenum gl_format; |
67 static GLenum gl_type; | |
1 | 68 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
69 static int int_pause; |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
70 |
1 | 71 static uint32_t texture_width; |
72 static uint32_t texture_height; | |
73 | |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
74 static unsigned int slice_height = 1; |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
75 |
612 | 76 static void resize(int x,int y){ |
11988 | 77 mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y); |
1 | 78 glViewport( 0, 0, x, y ); |
79 | |
80 glMatrixMode(GL_PROJECTION); | |
81 glLoadIdentity(); | |
13601 | 82 if (vo_fs && use_aspect) { |
83 int new_w, new_h; | |
84 GLdouble scale_x, scale_y; | |
85 aspect(&new_w, &new_h, A_ZOOM); | |
86 panscan_calc(); | |
87 new_w += vo_panscan_x; | |
88 new_h += vo_panscan_y; | |
89 scale_x = (GLdouble) new_w / (GLdouble) x; | |
90 scale_y = (GLdouble) new_h / (GLdouble) y; | |
91 glScaled(scale_x, scale_y, 1); | |
92 } | |
1 | 93 glOrtho(0, image_width, image_height, 0, -1,1); |
94 | |
95 glMatrixMode(GL_MODELVIEW); | |
96 glLoadIdentity(); | |
13585 | 97 |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
98 if (!scaled_osd) { |
13585 | 99 #ifdef HAVE_FREETYPE |
100 // adjust font size to display size | |
101 force_load_font = 1; | |
102 #endif | |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
103 vo_osd_changed(OSDTYPE_OSD); |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
104 } |
1 | 105 } |
106 | |
12159 | 107 static int find_gl_format (uint32_t format) |
108 { | |
12445
d97398ed403e
changes to get manyfmts nearer to working and fixed memory leak
reimar
parents:
12212
diff
changeset
|
109 image_bytes = (IMGFMT_RGB_DEPTH(format)+7)/8; |
d97398ed403e
changes to get manyfmts nearer to working and fixed memory leak
reimar
parents:
12212
diff
changeset
|
110 gl_texfmt = 3; |
12159 | 111 switch (format) { |
112 case IMGFMT_RGB24: | |
113 gl_format = GL_RGB; | |
114 gl_type = GL_UNSIGNED_BYTE; | |
115 break; | |
13206
6e8d1ac141fc
Using updated colorspace specifications from colorspaces.txt.
reimar
parents:
13188
diff
changeset
|
116 case IMGFMT_RGBA: |
12445
d97398ed403e
changes to get manyfmts nearer to working and fixed memory leak
reimar
parents:
12212
diff
changeset
|
117 gl_texfmt = 4; |
12159 | 118 gl_format = GL_RGBA; |
119 gl_type = GL_UNSIGNED_BYTE; | |
120 break; | |
121 case IMGFMT_Y800: | |
122 case IMGFMT_Y8: | |
12445
d97398ed403e
changes to get manyfmts nearer to working and fixed memory leak
reimar
parents:
12212
diff
changeset
|
123 gl_texfmt = 1; |
d97398ed403e
changes to get manyfmts nearer to working and fixed memory leak
reimar
parents:
12212
diff
changeset
|
124 image_bytes = 1; |
12159 | 125 gl_format = GL_LUMINANCE; |
126 gl_type = GL_UNSIGNED_BYTE; | |
127 break; | |
128 #ifdef GL_VERSION_1_2 | |
13993
9e331a5299b2
4 and 8 bit formats use a palette, so we cannot really support them (atm).
reimar
parents:
13920
diff
changeset
|
129 #if 0 |
9e331a5299b2
4 and 8 bit formats use a palette, so we cannot really support them (atm).
reimar
parents:
13920
diff
changeset
|
130 // we do not support palettized formats, although the format the |
9e331a5299b2
4 and 8 bit formats use a palette, so we cannot really support them (atm).
reimar
parents:
13920
diff
changeset
|
131 // swscale produces works |
12159 | 132 case IMGFMT_RGB8: |
133 gl_format = GL_RGB; | |
13206
6e8d1ac141fc
Using updated colorspace specifications from colorspaces.txt.
reimar
parents:
13188
diff
changeset
|
134 gl_type = GL_UNSIGNED_BYTE_2_3_3_REV; |
12159 | 135 break; |
13993
9e331a5299b2
4 and 8 bit formats use a palette, so we cannot really support them (atm).
reimar
parents:
13920
diff
changeset
|
136 #endif |
12159 | 137 case IMGFMT_RGB15: |
138 gl_format = GL_RGBA; | |
13206
6e8d1ac141fc
Using updated colorspace specifications from colorspaces.txt.
reimar
parents:
13188
diff
changeset
|
139 gl_type = GL_UNSIGNED_SHORT_1_5_5_5_REV; |
12159 | 140 break; |
141 case IMGFMT_RGB16: | |
142 gl_format = GL_RGB; | |
13206
6e8d1ac141fc
Using updated colorspace specifications from colorspaces.txt.
reimar
parents:
13188
diff
changeset
|
143 gl_type = GL_UNSIGNED_SHORT_5_6_5_REV; |
12159 | 144 break; |
13993
9e331a5299b2
4 and 8 bit formats use a palette, so we cannot really support them (atm).
reimar
parents:
13920
diff
changeset
|
145 #if 0 |
12159 | 146 case IMGFMT_BGR8: |
147 // special case as red and blue have a differen number of bits. | |
148 // GL_BGR and GL_UNSIGNED_BYTE_3_3_2 isn't supported at least | |
149 // by nVidia drivers, and in addition would give more bits to | |
150 // blue than to red, which isn't wanted | |
151 gl_format = GL_RGB; | |
13206
6e8d1ac141fc
Using updated colorspace specifications from colorspaces.txt.
reimar
parents:
13188
diff
changeset
|
152 gl_type = GL_UNSIGNED_BYTE_3_3_2; |
12159 | 153 break; |
13993
9e331a5299b2
4 and 8 bit formats use a palette, so we cannot really support them (atm).
reimar
parents:
13920
diff
changeset
|
154 #endif |
12159 | 155 case IMGFMT_BGR15: |
156 gl_format = GL_BGRA; | |
13206
6e8d1ac141fc
Using updated colorspace specifications from colorspaces.txt.
reimar
parents:
13188
diff
changeset
|
157 gl_type = GL_UNSIGNED_SHORT_1_5_5_5_REV; |
12159 | 158 break; |
159 case IMGFMT_BGR16: | |
160 gl_format = GL_RGB; | |
13206
6e8d1ac141fc
Using updated colorspace specifications from colorspaces.txt.
reimar
parents:
13188
diff
changeset
|
161 gl_type = GL_UNSIGNED_SHORT_5_6_5; |
12159 | 162 break; |
163 case IMGFMT_BGR24: | |
164 gl_format = GL_BGR; | |
165 gl_type = GL_UNSIGNED_BYTE; | |
166 break; | |
13206
6e8d1ac141fc
Using updated colorspace specifications from colorspaces.txt.
reimar
parents:
13188
diff
changeset
|
167 case IMGFMT_BGRA: |
12445
d97398ed403e
changes to get manyfmts nearer to working and fixed memory leak
reimar
parents:
12212
diff
changeset
|
168 gl_texfmt = 4; |
12159 | 169 gl_format = GL_BGRA; |
170 gl_type = GL_UNSIGNED_BYTE; | |
171 break; | |
172 #endif | |
173 default: | |
12445
d97398ed403e
changes to get manyfmts nearer to working and fixed memory leak
reimar
parents:
12212
diff
changeset
|
174 gl_texfmt = 4; |
12159 | 175 gl_format = GL_RGBA; |
176 gl_type = GL_UNSIGNED_BYTE; | |
177 return 0; | |
178 } | |
12843
52d493f0ac79
changed misleading TEXTUREFORMAT_32BPP (was 24bpp!) to vo_gl2 style TEXTUREFORMAT_ALWAYS
reimar
parents:
12749
diff
changeset
|
179 #ifdef TEXTUREFORMAT_ALWAYS |
52d493f0ac79
changed misleading TEXTUREFORMAT_32BPP (was 24bpp!) to vo_gl2 style TEXTUREFORMAT_ALWAYS
reimar
parents:
12749
diff
changeset
|
180 gl_texfmt = TEXTUREFORMAT_ALWAYS; |
12445
d97398ed403e
changes to get manyfmts nearer to working and fixed memory leak
reimar
parents:
12212
diff
changeset
|
181 #endif |
12159 | 182 return 1; |
183 } | |
184 | |
13843 | 185 /** |
186 * \brief Initialize a (new or reused) OpenGL context. | |
187 */ | |
188 static int initGl(uint32_t d_width, uint32_t d_height) { | |
189 unsigned char *ImageData = NULL; | |
190 texture_width = 32; | |
191 while (texture_width < image_width || | |
192 texture_width < image_height) | |
193 texture_width *= 2; | |
194 texture_height = texture_width; | |
195 | |
196 glDisable(GL_BLEND); | |
197 glDisable(GL_DEPTH_TEST); | |
198 glDepthMask(GL_FALSE); | |
199 glDisable(GL_CULL_FACE); | |
200 glEnable(GL_TEXTURE_2D); | |
201 | |
202 mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n", | |
203 texture_width, texture_height); | |
204 | |
205 glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER, GL_LINEAR); | |
206 glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER, GL_LINEAR); | |
207 | |
208 glAdjustAlignment(texture_width * image_bytes); | |
209 ImageData = malloc(texture_width * texture_height * image_bytes); | |
210 memset(ImageData, 0, texture_width * texture_height * image_bytes); | |
211 glTexImage2D(GL_TEXTURE_2D, 0, gl_texfmt, texture_width, texture_height, 0, | |
212 gl_format, gl_type, ImageData); | |
213 free (ImageData); | |
214 | |
215 // set alignment as default is 4 which will break some files | |
216 glAdjustAlignment(image_width * image_bytes); | |
217 | |
218 resize(d_width, d_height); | |
219 | |
220 glClearColor( 0.0f,0.0f,0.0f,0.0f ); | |
221 glClear( GL_COLOR_BUFFER_BIT ); | |
13920 | 222 return 1; |
13843 | 223 } |
224 | |
1 | 225 /* connect to server, create and map window, |
226 * allocate colors and (shared) memory | |
227 */ | |
228 static uint32_t | |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
7111
diff
changeset
|
229 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) |
1 | 230 { |
231 image_height = height; | |
232 image_width = width; | |
12159 | 233 find_gl_format (format); |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
234 |
13585 | 235 sub_bg_alpha = 255; // We need alpha = 255 for invisible part of the OSD |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
236 int_pause = 0; |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
237 |
13601 | 238 panscan_init(); |
2249
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2057
diff
changeset
|
239 aspect_save_orig(width,height); |
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2057
diff
changeset
|
240 aspect_save_prescale(d_width,d_height); |
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2057
diff
changeset
|
241 aspect_save_screenres(vo_screenwidth,vo_screenheight); |
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2057
diff
changeset
|
242 |
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2057
diff
changeset
|
243 aspect(&d_width,&d_height,A_NOZOOM); |
2040 | 244 #ifdef X11_FULLSCREEN |
6095 | 245 // if( flags&0x01 ){ // (-fs) |
246 // aspect(&d_width,&d_height,A_ZOOM); | |
247 // } | |
2040 | 248 #endif |
13843 | 249 #ifdef HAVE_NEW_GUI |
250 if (use_gui) { | |
251 // GUI creates and manages window for us | |
252 vo_dwidth = d_width; | |
253 vo_dheight= d_height; | |
254 guiGetEvent(guiSetShVideo, 0); | |
255 setGlWindow(&gl_vinfo, &gl_context, vo_window); | |
256 initGl(vo_dwidth, vo_dheight); | |
257 return 0; | |
258 } | |
259 #endif | |
260 if ( vo_window == None ) { | |
261 unsigned int fg, bg; | |
262 XSizeHints hint; | |
263 XVisualInfo *vinfo; | |
264 XEvent xev; | |
265 | |
13871 | 266 vo_fs = VO_FALSE; |
13843 | 267 |
1 | 268 hint.x = 0; |
269 hint.y = 0; | |
270 hint.width = d_width; | |
271 hint.height = d_height; | |
272 hint.flags = PPosition | PSize; | |
273 | |
274 /* Get some colors */ | |
275 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
276 bg = WhitePixel(mDisplay, mScreen); |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
277 fg = BlackPixel(mDisplay, mScreen); |
1 | 278 |
279 /* Make the window */ | |
280 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
281 vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib ); |
1290 | 282 if (vinfo == NULL) |
283 { | |
11988 | 284 mp_msg(MSGT_VO, MSGL_ERR, "[gl] no GLX support present\n"); |
1290 | 285 return -1; |
286 } | |
1 | 287 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
288 |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
289 |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
290 vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vinfo->visual, hint.x, hint.y, hint.width, hint.height, |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
291 vinfo->depth, XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone)); |
1 | 292 |
7777 | 293 vo_x11_classhint( mDisplay,vo_window,"gl" ); |
294 vo_hidecursor(mDisplay,vo_window); | |
1 | 295 |
7777 | 296 // if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 ); |
297 XSelectInput(mDisplay, vo_window, StructureNotifyMask); | |
298 /* Tell other applications about this window */ | |
10138
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
299 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint); |
7777 | 300 /* Map window. */ |
301 XMapWindow(mDisplay, vo_window); | |
4017 | 302 #ifdef HAVE_XINERAMA |
7777 | 303 vo_x11_xinerama_move(mDisplay,vo_window); |
4017 | 304 #endif |
1 | 305 |
7777 | 306 /* Wait for map. */ |
307 do | |
308 { | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
309 XNextEvent(mDisplay, &xev); |
7777 | 310 } |
311 while (xev.type != MapNotify || xev.xmap.event != vo_window); | |
1 | 312 |
7777 | 313 XSelectInput(mDisplay, vo_window, NoEventMask); |
1 | 314 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
315 XSync(mDisplay, False); |
1 | 316 |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6212
diff
changeset
|
317 vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
318 | ButtonPressMask | ButtonReleaseMask | ExposureMask |
4658 | 319 ); |
13843 | 320 } |
321 if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
13575 | 322 |
13843 | 323 vo_x11_nofs_sizepos(0, 0, d_width, d_height); |
324 if (vo_fs ^ (flags & VOFLAG_FULLSCREEN)) | |
325 vo_x11_fullscreen(); | |
326 setGlWindow(&gl_vinfo, &gl_context, vo_window); | |
327 initGl(vo_dwidth, vo_dheight); | |
11542 | 328 |
1 | 329 return 0; |
330 } | |
331 | |
31 | 332 static void check_events(void) |
1 | 333 { |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
334 int e=vo_x11_check_events(mDisplay); |
31 | 335 if(e&VO_EVENT_RESIZE) resize(vo_dwidth,vo_dheight); |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
336 if(e&VO_EVENT_EXPOSE && int_pause) flip_page(); |
31 | 337 } |
1 | 338 |
13585 | 339 /** |
340 * Creates the textures and the display list needed for displaying | |
341 * an OSD part. | |
342 * Callback function for vo_draw_text(). | |
343 */ | |
344 static void create_osd_texture(int x0, int y0, int w, int h, | |
345 unsigned char *src, unsigned char *srca, | |
346 int stride) | |
347 { | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
348 // initialize to 8 to avoid special-casing on alignment |
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
349 int sx = 8, sy = 8; |
13585 | 350 GLfloat xcov, ycov; |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
351 GLint scale_type = (scaled_osd) ? GL_LINEAR : GL_NEAREST; |
13585 | 352 char *clearTexture; |
353 while (sx < w) sx *= 2; | |
354 while (sy < h) sy *= 2; | |
355 xcov = (GLfloat) w / (GLfloat) sx; | |
356 ycov = (GLfloat) h / (GLfloat) sy; | |
357 | |
358 if (osdtexCnt >= MAX_OSD_PARTS) { | |
359 mp_msg(MSGT_VO, MSGL_ERR, "Too many OSD parts, contact the developers!\n"); | |
360 return; | |
361 } | |
362 clearTexture = malloc(sx * sy); | |
363 memset(clearTexture, 0, sx * sy); | |
364 | |
365 // create Textures for OSD part | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
366 glAdjustAlignment(stride); |
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
367 glPixelStorei(GL_UNPACK_ROW_LENGTH, stride); |
13585 | 368 glGenTextures(1, &osdtex[osdtexCnt]); |
369 glBindTexture(GL_TEXTURE_2D, osdtex[osdtexCnt]); | |
370 glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, sx, sy, 0, | |
371 GL_LUMINANCE, GL_UNSIGNED_BYTE, clearTexture); | |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
372 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, scale_type); |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
373 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, scale_type); |
13585 | 374 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_LUMINANCE, |
375 GL_UNSIGNED_BYTE, src); | |
376 | |
377 #ifndef FAST_OSD | |
378 glGenTextures(1, &osdatex[osdtexCnt]); | |
379 glBindTexture(GL_TEXTURE_2D, osdatex[osdtexCnt]); | |
380 glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, sx, sy, 0, | |
381 GL_LUMINANCE, GL_UNSIGNED_BYTE, clearTexture); | |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
382 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, scale_type); |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
383 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, scale_type); |
13585 | 384 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_ALPHA, |
385 GL_UNSIGNED_BYTE, srca); | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
386 #endif |
13585 | 387 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
388 glAdjustAlignment(image_width * image_bytes); |
13585 | 389 |
390 glBindTexture(GL_TEXTURE_2D, 0); | |
391 free(clearTexture); | |
392 | |
393 // Create a list for rendering this OSD part | |
394 osdDispList[osdtexCnt] = glGenLists(1); | |
395 glNewList(osdDispList[osdtexCnt], GL_COMPILE); | |
396 #ifndef FAST_OSD | |
397 // render alpha | |
398 glBlendFunc(GL_ZERO, GL_SRC_ALPHA); | |
399 glBindTexture(GL_TEXTURE_2D, osdatex[osdtexCnt]); | |
400 glBegin(GL_QUADS); | |
401 glTexCoord2f (0, 0); | |
402 glVertex2f (x0, y0); | |
403 glTexCoord2f (0, ycov); | |
404 glVertex2f (x0, y0 + h); | |
405 glTexCoord2f (xcov, ycov); | |
406 glVertex2f (x0 + w, y0 + h); | |
407 glTexCoord2f (xcov, 0); | |
408 glVertex2f (x0 + w, y0); | |
409 glEnd(); | |
410 #endif | |
411 // render OSD | |
412 glBlendFunc (GL_ONE, GL_ONE); | |
413 glBindTexture(GL_TEXTURE_2D, osdtex[osdtexCnt]); | |
414 glBegin(GL_QUADS); | |
415 glTexCoord2f (0, 0); | |
416 glVertex2f (x0, y0); | |
417 glTexCoord2f (0, ycov); | |
418 glVertex2f (x0, y0 + h); | |
419 glTexCoord2f (xcov, ycov); | |
420 glVertex2f (x0 + w, y0 + h); | |
421 glTexCoord2f (xcov, 0); | |
422 glVertex2f (x0 + w, y0); | |
423 glEnd(); | |
424 glEndList(); | |
425 | |
426 osdtexCnt++; | |
427 } | |
428 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
429 static void draw_osd(void) |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
430 { |
13585 | 431 int i; |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
432 int osd_h, osd_w; |
13585 | 433 if (!use_osd) return; |
434 if (vo_osd_changed(0)) { | |
435 for (i = 0; i < osdtexCnt; i++) { | |
436 glDeleteTextures(1, &osdtex[i]); | |
437 #ifndef FAST_OSD | |
438 glDeleteTextures(1, &osdatex[i]); | |
439 #endif | |
440 glDeleteLists(osdDispList[i], 1); | |
441 } | |
442 osdtexCnt = 0; | |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
443 |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
444 osd_w = (scaled_osd) ? image_width : vo_dwidth; |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
445 osd_h = (scaled_osd) ? image_height : vo_dheight; |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
446 vo_draw_text(osd_w, osd_h, create_osd_texture); |
13585 | 447 } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
448 } |
31 | 449 |
450 static void | |
451 flip_page(void) | |
452 { | |
453 | |
1 | 454 // glEnable(GL_TEXTURE_2D); |
455 // glBindTexture(GL_TEXTURE_2D, texture_id); | |
456 | |
457 glColor3f(1,1,1); | |
458 glBegin(GL_QUADS); | |
459 glTexCoord2f(0,0);glVertex2i(0,0); | |
460 glTexCoord2f(0,1);glVertex2i(0,texture_height); | |
461 glTexCoord2f(1,1);glVertex2i(texture_width,texture_height); | |
462 glTexCoord2f(1,0);glVertex2i(texture_width,0); | |
463 glEnd(); | |
464 | |
13585 | 465 if (osdtexCnt > 0) { |
466 // set special rendering parameters | |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
467 if (!scaled_osd) { |
13585 | 468 glMatrixMode(GL_PROJECTION); |
469 glPushMatrix(); | |
470 glLoadIdentity(); | |
471 glOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1); | |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
472 } |
13585 | 473 glEnable(GL_BLEND); |
474 // draw OSD | |
475 glCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList); | |
476 // set rendering parameters back to defaults | |
477 glDisable (GL_BLEND); | |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
478 if (!scaled_osd) |
13585 | 479 glPopMatrix(); |
480 glBindTexture(GL_TEXTURE_2D, 0); | |
481 } | |
482 | |
1 | 483 // glFlush(); |
484 glFinish(); | |
6095 | 485 glXSwapBuffers( mDisplay,vo_window ); |
486 | |
13601 | 487 if (vo_fs && use_aspect) |
488 glClear(GL_COLOR_BUFFER_BIT); | |
1 | 489 } |
490 | |
491 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num) | |
492 static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) | |
493 { | |
494 return 0; | |
495 } | |
496 | |
497 | |
10138
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
498 static uint32_t |
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
499 draw_frame(uint8_t *src[]) |
1 | 500 { |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
501 unsigned int i; |
1 | 502 uint8_t *ImageData=src[0]; |
503 | |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
504 if (slice_height == 0) |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
505 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, image_width, image_height, |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
506 gl_format, gl_type, ImageData); |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
507 else |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
508 for(i=0;i<image_height;i+=slice_height){ |
1 | 509 glTexSubImage2D( GL_TEXTURE_2D, // target |
510 0, // level | |
511 0, // x offset | |
512 // image_height-1-i, // y offset | |
513 i, // y offset | |
514 image_width, // width | |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
515 (i+slice_height<=image_height)?slice_height:image_height-i, // height |
12159 | 516 gl_format, |
517 gl_type, | |
1 | 518 ImageData+i*image_bytes*image_width ); // *pixels |
519 } | |
520 | |
521 return 0; | |
522 } | |
523 | |
524 static uint32_t | |
525 query_format(uint32_t format) | |
526 { | |
13585 | 527 int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; |
528 if (use_osd) | |
529 caps |= VFCAP_OSD; | |
13206
6e8d1ac141fc
Using updated colorspace specifications from colorspaces.txt.
reimar
parents:
13188
diff
changeset
|
530 if ((format == IMGFMT_RGB24) || (format == IMGFMT_RGBA)) |
13585 | 531 return caps; |
12159 | 532 if (many_fmts && find_gl_format(format)) |
13585 | 533 return caps; |
1 | 534 return 0; |
535 } | |
536 | |
537 | |
538 static void | |
539 uninit(void) | |
540 { | |
6095 | 541 if ( !vo_config_count ) return; |
13843 | 542 releaseGlContext(&gl_vinfo, &gl_context); |
6095 | 543 vo_x11_uninit(); |
1 | 544 } |
4352 | 545 |
546 static uint32_t preinit(const char *arg) | |
547 { | |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
548 int parse_err = 0; |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
549 unsigned int parse_pos = 0; |
12159 | 550 many_fmts = 0; |
13585 | 551 use_osd = 1; |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
552 scaled_osd = 0; |
13601 | 553 use_aspect = 1; |
12159 | 554 slice_height = 4; |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
555 if(arg) |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
556 { |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
557 while (arg[parse_pos] && !parse_err) { |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
558 if (strncmp (&arg[parse_pos], "manyfmts", 8) == 0) { |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
559 parse_pos += 8; |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
560 many_fmts = 1; |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
561 } else if (strncmp (&arg[parse_pos], "nomanyfmts", 10) == 0) { |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
562 parse_pos += 10; |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
563 many_fmts = 0; |
13585 | 564 } else if (strncmp (&arg[parse_pos], "osd", 3) == 0) { |
565 parse_pos += 3; | |
566 use_osd = 1; | |
567 } else if (strncmp (&arg[parse_pos], "noosd", 5) == 0) { | |
568 parse_pos += 5; | |
569 use_osd = 0; | |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
570 } else if (strncmp (&arg[parse_pos], "scaled-osd", 10) == 0) { |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
571 parse_pos += 10; |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
572 scaled_osd = 1; |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
573 } else if (strncmp (&arg[parse_pos], "noscaled-osd", 12) == 0) { |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
574 parse_pos += 12; |
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
575 scaled_osd = 0; |
13601 | 576 } else if (strncmp (&arg[parse_pos], "aspect", 6) == 0) { |
577 parse_pos += 6; | |
578 use_aspect = 1; | |
579 } else if (strncmp (&arg[parse_pos], "noaspect", 8) == 0) { | |
580 parse_pos += 8; | |
581 use_aspect = 0; | |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
582 } else if (strncmp (&arg[parse_pos], "slice-height=", 13) == 0) { |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
583 int val; |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
584 char *end; |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
585 parse_pos += 13; |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
586 val = strtol(&arg[parse_pos], &end, 0); |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
587 if (val < 0) parse_err = 1; |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
588 else { |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
589 slice_height = val; |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
590 parse_pos = end - arg; |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
591 } |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
592 } |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
593 if (arg[parse_pos] == ':') parse_pos++; |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
594 else if (arg[parse_pos]) parse_err = 1; |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
595 } |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
596 } |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
597 if (parse_err) { |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
598 unsigned int i; |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
599 mp_msg(MSGT_VO, MSGL_FATAL, "Could not parse arguments:\n%s\n", arg); |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
600 for (i = 0; i < parse_pos; i++) |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
601 mp_msg(MSGT_VO, MSGL_FATAL, " "); |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
602 mp_msg(MSGT_VO, MSGL_FATAL, "^\n"); |
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
603 mp_msg(MSGT_VO, MSGL_FATAL, |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
604 "\n-vo gl command line help:\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
605 "Example: mplayer -vo gl:slice-height=4\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
606 "\nOptions:\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
607 " manyfmts\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
608 " Enable extended color formats for OpenGL 1.2 and later\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
609 " slice-height=<0-...>\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
610 " Slice size for texture transfer, 0 for whole image\n" |
13585 | 611 " noosd\n" |
612 " Do not use OpenGL OSD code\n" | |
13601 | 613 " noaspect\n" |
614 " Do not do aspect scaling\n" | |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
615 "\n" ); |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
616 return -1; |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
617 } |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
618 if (many_fmts) |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
619 mp_msg (MSGT_VO, MSGL_WARN, "[gl] using extended formats.\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
620 "Make sure you have OpenGL >= 1.2 and used corresponding " |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
621 "headers for compiling!\n"); |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
622 mp_msg (MSGT_VO, MSGL_INFO, "[gl] Using %d as slice height " |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
623 "(0 means image height).\n", slice_height); |
7931 | 624 if( !vo_init() ) return -1; // Can't open X11 |
7777 | 625 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
626 return 0; |
4352 | 627 } |
628 | |
4596 | 629 static uint32_t control(uint32_t request, void *data, ...) |
4352 | 630 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
631 switch (request) { |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
632 case VOCTRL_PAUSE: return (int_pause=1); |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10138
diff
changeset
|
633 case VOCTRL_RESUME: return (int_pause=0); |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
634 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
635 return query_format(*((uint32_t*)data)); |
13843 | 636 case VOCTRL_GUISUPPORT: |
637 return VO_TRUE; | |
11542 | 638 case VOCTRL_ONTOP: |
639 vo_x11_ontop(); | |
640 return VO_TRUE; | |
6095 | 641 case VOCTRL_FULLSCREEN: |
642 vo_x11_fullscreen(); | |
643 return VO_TRUE; | |
13601 | 644 case VOCTRL_GET_PANSCAN: |
645 if (!use_aspect) return VO_NOTIMPL; | |
646 return VO_TRUE; | |
647 case VOCTRL_SET_PANSCAN: | |
648 if (!use_aspect) return VO_NOTIMPL; | |
649 resize (vo_dwidth, vo_dheight); | |
650 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
651 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
652 return VO_NOTIMPL; |
4352 | 653 } |