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