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