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