Mercurial > mplayer.hg
annotate libvo/vo_gl.c @ 10386:f726201d9c5b
Quote all .IPs with more than one argument (necessary!).
Do not quote .IPs with just one argument (cosmetics).
author | diego |
---|---|
date | Sun, 06 Jul 2003 13:05:43 +0000 |
parents | 5e286cc6ad21 |
children | 3aea64e0d6d9 |
rev | line source |
---|---|
1 | 1 #define TEXTUREFORMAT_32BPP |
2 | |
3 #include <stdio.h> | |
4 #include <stdlib.h> | |
5 #include <string.h> | |
6 #include <math.h> | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
7 #include <errno.h> |
1 | 8 |
9 #include "config.h" | |
10 #include "video_out.h" | |
11 #include "video_out_internal.h" | |
12 | |
13 #include <X11/Xlib.h> | |
14 #include <X11/Xutil.h> | |
15 //#include <X11/keysym.h> | |
16 #include <GL/glx.h> | |
17 #include <errno.h> | |
18 | |
19 #include <GL/gl.h> | |
20 | |
31 | 21 #include "x11_common.h" |
2057 | 22 #include "aspect.h" |
31 | 23 |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7931
diff
changeset
|
24 static vo_info_t info = |
1 | 25 { |
26 "X11 (OpenGL)", | |
27 "gl", | |
28 "Arpad Gereoffy <arpi@esp-team.scene.hu>", | |
29 "" | |
30 }; | |
31 | |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7931
diff
changeset
|
32 LIBVO_EXTERN(gl) |
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7931
diff
changeset
|
33 |
1 | 34 /* local data */ |
35 static unsigned char *ImageData=NULL; | |
36 | |
37 static GLXContext wsGLXContext; | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
38 static int wsGLXAttrib[] = { GLX_RGBA, |
1 | 39 GLX_RED_SIZE,1, |
40 GLX_GREEN_SIZE,1, | |
41 GLX_BLUE_SIZE,1, | |
42 GLX_DOUBLEBUFFER, | |
43 None }; | |
44 | |
45 | |
46 static uint32_t image_width; | |
47 static uint32_t image_height; | |
48 static uint32_t image_bytes; | |
49 | |
50 static uint32_t texture_width; | |
51 static uint32_t texture_height; | |
52 | |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
53 static int slice_height=1; |
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
54 |
612 | 55 static void resize(int x,int y){ |
1290 | 56 printf("[gl] Resize: %dx%d\n",x,y); |
1 | 57 glViewport( 0, 0, x, y ); |
58 | |
59 glMatrixMode(GL_PROJECTION); | |
60 glLoadIdentity(); | |
61 glOrtho(0, image_width, image_height, 0, -1,1); | |
62 | |
63 glMatrixMode(GL_MODELVIEW); | |
64 glLoadIdentity(); | |
65 } | |
66 | |
67 /* connect to server, create and map window, | |
68 * allocate colors and (shared) memory | |
69 */ | |
70 static uint32_t | |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
7111
diff
changeset
|
71 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) |
1 | 72 { |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
73 // int screen; |
1 | 74 unsigned int fg, bg; |
75 XSizeHints hint; | |
76 XVisualInfo *vinfo; | |
77 XEvent xev; | |
78 | |
1109 | 79 // XGCValues xgcv; |
1 | 80 XSetWindowAttributes xswa; |
81 unsigned long xswamask; | |
82 | |
83 image_height = height; | |
84 image_width = width; | |
85 | |
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
|
86 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
|
87 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
|
88 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
|
89 |
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2057
diff
changeset
|
90 aspect(&d_width,&d_height,A_NOZOOM); |
2040 | 91 #ifdef X11_FULLSCREEN |
6095 | 92 // if( flags&0x01 ){ // (-fs) |
93 // aspect(&d_width,&d_height,A_ZOOM); | |
94 // } | |
2040 | 95 #endif |
1 | 96 hint.x = 0; |
97 hint.y = 0; | |
98 hint.width = d_width; | |
99 hint.height = d_height; | |
100 hint.flags = PPosition | PSize; | |
101 | |
102 /* Get some colors */ | |
103 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
104 bg = WhitePixel(mDisplay, mScreen); |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
105 fg = BlackPixel(mDisplay, mScreen); |
1 | 106 |
107 /* Make the window */ | |
108 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
109 vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib ); |
1290 | 110 if (vinfo == NULL) |
111 { | |
112 printf("[gl] no GLX support present\n"); | |
113 return -1; | |
114 } | |
1 | 115 |
116 xswa.background_pixel = 0; | |
117 xswa.border_pixel = 1; | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
118 xswa.colormap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone); |
1 | 119 xswamask = CWBackPixel | CWBorderPixel | CWColormap; |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
120 |
7777 | 121 if ( vo_window == None ) |
122 { | |
123 vo_window = XCreateWindow(mDisplay, mRootWin, | |
124 hint.x, hint.y, hint.width, hint.height, 4, vinfo->depth,CopyFromParent,vinfo->visual,xswamask,&xswa); | |
1 | 125 |
7777 | 126 vo_x11_classhint( mDisplay,vo_window,"gl" ); |
127 vo_hidecursor(mDisplay,vo_window); | |
1 | 128 |
7777 | 129 // if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 ); |
130 XSelectInput(mDisplay, vo_window, StructureNotifyMask); | |
131 /* 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
|
132 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint); |
7777 | 133 /* Map window. */ |
134 XMapWindow(mDisplay, vo_window); | |
135 if ( flags&1 ) vo_x11_fullscreen(); | |
4017 | 136 #ifdef HAVE_XINERAMA |
7777 | 137 vo_x11_xinerama_move(mDisplay,vo_window); |
4017 | 138 #endif |
1 | 139 |
7777 | 140 /* Wait for map. */ |
141 do | |
142 { | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
143 XNextEvent(mDisplay, &xev); |
7777 | 144 } |
145 while (xev.type != MapNotify || xev.xmap.event != vo_window); | |
1 | 146 |
7777 | 147 XSelectInput(mDisplay, vo_window, NoEventMask); |
148 } | |
1 | 149 |
7777 | 150 if ( vo_config_count ) glXDestroyContext( mDisplay,wsGLXContext ); |
151 wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True ); | |
152 glXMakeCurrent( mDisplay,vo_window,wsGLXContext ); | |
1 | 153 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
154 XFlush(mDisplay); |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
155 XSync(mDisplay, False); |
1 | 156 |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6212
diff
changeset
|
157 vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask |
4658 | 158 | ButtonPressMask | ButtonReleaseMask |
159 ); | |
1 | 160 |
161 texture_width=32; | |
10138
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
162 while(texture_width<image_width || texture_width<image_height) texture_width*=2; |
1 | 163 texture_height=texture_width; |
164 | |
10138
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
165 image_bytes=(IMGFMT_RGB_DEPTH(format)+7)/8; |
1 | 166 |
7777 | 167 if ( ImageData ) free( ImageData ); |
1 | 168 ImageData=malloc(texture_width*texture_height*image_bytes); |
169 memset(ImageData,128,texture_width*texture_height*image_bytes); | |
170 | |
171 glDisable(GL_BLEND); | |
172 glDisable(GL_DEPTH_TEST); | |
173 glDepthMask(GL_FALSE); | |
174 glDisable(GL_CULL_FACE); | |
175 | |
176 glEnable(GL_TEXTURE_2D); | |
177 | |
1290 | 178 printf("[gl] Creating %dx%d texture...\n",texture_width,texture_height); |
1 | 179 |
180 #if 1 | |
181 // glBindTexture(GL_TEXTURE_2D, texture_id); | |
182 glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER, GL_LINEAR); | |
183 glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER, GL_LINEAR); | |
10138
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
184 /* Old OpenGL 1.0 used the third parameter (known as internalFormat) as an |
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
185 integer, which indicated the bytes per pixel (bpp). Later in OpenGL 1.1 |
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
186 they switched to constants, like GL_RGB8. GL_RGB8 means 8 bits for each |
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
187 channel (R,G,B), so it's equal to RGB24. It should be safe to pass the |
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
188 image_bytes to internalFormat with newer OpenGL versions. |
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
189 Anyway, I'm leaving this so as it was, it doesn't hurt, as OpenGL 1.1 is |
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
190 about 10 years old too. -- alex |
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
191 */ |
1 | 192 #ifdef TEXTUREFORMAT_32BPP |
193 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, texture_width, texture_height, 0, | |
194 #else | |
10138
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
195 glTexImage2D(GL_TEXTURE_2D, 0, image_bytes, texture_width, texture_height, 0, |
1 | 196 #endif |
197 (image_bytes==4)?GL_RGBA:GL_BGR, GL_UNSIGNED_BYTE, ImageData); | |
198 #endif | |
199 | |
200 resize(d_width,d_height); | |
201 | |
202 glClearColor( 1.0f,0.0f,1.0f,0.0f ); | |
203 glClear( GL_COLOR_BUFFER_BIT ); | |
204 | |
205 // printf("OpenGL setup OK!\n"); | |
206 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
207 saver_off(mDisplay); // turning off screen saver |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
208 |
1 | 209 return 0; |
210 } | |
211 | |
31 | 212 static void check_events(void) |
1 | 213 { |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
214 int e=vo_x11_check_events(mDisplay); |
31 | 215 if(e&VO_EVENT_RESIZE) resize(vo_dwidth,vo_dheight); |
216 } | |
1 | 217 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
218 static void draw_osd(void) |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
219 { |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
220 } |
31 | 221 |
222 static void | |
223 flip_page(void) | |
224 { | |
225 | |
1 | 226 // glEnable(GL_TEXTURE_2D); |
227 // glBindTexture(GL_TEXTURE_2D, texture_id); | |
228 | |
229 glColor3f(1,1,1); | |
230 glBegin(GL_QUADS); | |
231 glTexCoord2f(0,0);glVertex2i(0,0); | |
232 glTexCoord2f(0,1);glVertex2i(0,texture_height); | |
233 glTexCoord2f(1,1);glVertex2i(texture_width,texture_height); | |
234 glTexCoord2f(1,0);glVertex2i(texture_width,0); | |
235 glEnd(); | |
236 | |
237 // glFlush(); | |
238 glFinish(); | |
6095 | 239 glXSwapBuffers( mDisplay,vo_window ); |
240 | |
1 | 241 } |
242 | |
243 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num) | |
244 static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) | |
245 { | |
246 return 0; | |
247 } | |
248 | |
249 | |
10138
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
250 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
|
251 draw_frame(uint8_t *src[]) |
1 | 252 { |
253 int i; | |
254 uint8_t *ImageData=src[0]; | |
255 | |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
256 for(i=0;i<image_height;i+=slice_height){ |
1 | 257 glTexSubImage2D( GL_TEXTURE_2D, // target |
258 0, // level | |
259 0, // x offset | |
260 // image_height-1-i, // y offset | |
261 i, // y offset | |
262 image_width, // width | |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
263 (i+slice_height<=image_height)?slice_height:image_height-i, // height |
1 | 264 (image_bytes==4)?GL_RGBA:GL_RGB, // format |
265 GL_UNSIGNED_BYTE, // type | |
266 ImageData+i*image_bytes*image_width ); // *pixels | |
267 } | |
268 | |
269 return 0; | |
270 } | |
271 | |
272 static uint32_t | |
273 query_format(uint32_t format) | |
274 { | |
10138
5e286cc6ad21
Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents:
8654
diff
changeset
|
275 if ((format == IMGFMT_RGB24) || (format == IMGFMT_RGB32)) |
6212 | 276 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; |
1 | 277 return 0; |
278 } | |
279 | |
280 | |
281 static void | |
282 uninit(void) | |
283 { | |
6095 | 284 if ( !vo_config_count ) return; |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
285 saver_on(mDisplay); // screen saver back on |
6095 | 286 vo_x11_uninit(); |
1 | 287 } |
4352 | 288 |
289 static uint32_t preinit(const char *arg) | |
290 { | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
291 if(arg) |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
292 { |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
293 slice_height = atoi(arg); |
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
294 if (slice_height <= 0) |
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
295 slice_height = 65536; |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
296 } |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
297 else |
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
298 { |
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
299 slice_height = 4; |
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
300 } |
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
301 printf("[vo_gl] Using %d as slice_height (0 means image_height).\n", slice_height); |
7777 | 302 |
7931 | 303 if( !vo_init() ) return -1; // Can't open X11 |
7777 | 304 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
305 return 0; |
4352 | 306 } |
307 | |
4596 | 308 static uint32_t control(uint32_t request, void *data, ...) |
4352 | 309 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
310 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
311 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
312 return query_format(*((uint32_t*)data)); |
6095 | 313 case VOCTRL_FULLSCREEN: |
314 vo_x11_fullscreen(); | |
315 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
316 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
317 return VO_NOTIMPL; |
4352 | 318 } |