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