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