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