annotate libvo/vo_gl.c @ 20562:25c9cd2ac456

trivial sync with r20551 update missing sync tag in ports.xml (r20561) r20571: cvidix tricks, based on patch by Reimar no real change need for r20572
author voroshil
date Wed, 01 Nov 2006 12:27:56 +0000
parents 0c63edaa7714
children 8174acbf0633
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3 #include <string.h>
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
4 #include <math.h>
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16214
diff changeset
6 #include "config.h"
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
7 #include "mp_msg.h"
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
8 #include "subopt-helper.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 #include "video_out_internal.h"
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
11 #include "font_load.h"
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
12 #include "sub.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
14 #include "gl_common.h"
2057
378aed6b232d Use aspect()
atmos4
parents: 2041
diff changeset
15 #include "aspect.h"
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
16 #ifdef HAVE_NEW_GUI
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
17 #include "Gui/interface.h"
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
18 #endif
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
19 #include "libass/ass.h"
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
20
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7931
diff changeset
21 static vo_info_t info =
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 {
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
23 "X11 (OpenGL)",
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
24 "gl",
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
25 "Arpad Gereoffy <arpi@esp-team.scene.hu>",
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
26 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7931
diff changeset
29 LIBVO_EXTERN(gl)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7931
diff changeset
30
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
31 #ifdef GL_WIN32
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
32 static int gl_vinfo = 0;
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
33 static HGLRC gl_context = 0;
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
34 #else
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
35 static XVisualInfo *gl_vinfo = NULL;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
36 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
37 static int wsGLXAttrib[] = { GLX_RGBA,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
38 GLX_RED_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
39 GLX_GREEN_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
40 GLX_BLUE_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41 GLX_DOUBLEBUFFER,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 None };
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
43 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
45 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
46 static int scaled_osd;
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
47 //! How many parts the OSD may consist of at most
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
48 #define MAX_OSD_PARTS 20
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
49 //! Textures for OSD
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
50 static GLuint osdtex[MAX_OSD_PARTS];
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
51 #ifndef FAST_OSD
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
52 //! Alpha textures for OSD
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
53 static GLuint osdatex[MAX_OSD_PARTS];
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
54 #endif
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
55 static GLuint *eosdtex;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
56 static GLuint largeeosdtex[2];
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
57 //! Display lists that draw the OSD parts
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
58 static GLuint osdDispList[MAX_OSD_PARTS];
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
59 #ifndef FAST_OSD
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
60 static GLuint osdaDispList[MAX_OSD_PARTS];
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
61 #endif
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
62 static GLuint eosdDispList;
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
63 //! How many parts the OSD currently consists of
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
64 static int osdtexCnt;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
65 static int eosdtexCnt;
17956
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
66 static int osd_color;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
68 static int use_aspect;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
69 static int use_yuv;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
70 static int lscale;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
71 static int cscale;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
72 static int yuvconvtype;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
73 static int use_rectangle;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
74 static int err_shown;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
76 static uint32_t image_height;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
77 static uint32_t image_format;
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
78 static int many_fmts;
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
79 static int use_glFinish;
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
80 static int swap_interval;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
81 static GLenum gl_target;
16303
a87c6cf3fe52 Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents: 16282
diff changeset
82 static GLint gl_texfmt;
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
83 static GLenum gl_format;
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
84 static GLenum gl_type;
16434
db8d8039a5f4 gl_buffer should be unsigned
reimar
parents: 16433
diff changeset
85 static GLuint gl_buffer;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
86 static int gl_buffersize;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
87 static GLuint fragprog;
18896
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
88 static GLuint default_texs[22];
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
89 static char *custom_prog;
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
90 static char *custom_tex;
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
91 static int custom_tlin;
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
92 static int custom_trect;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
94 static int int_pause;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
95 static int eq_bri = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
96 static int eq_cont = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
97 static int eq_sat = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
98 static int eq_hue = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
99 static int eq_rgamma = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
100 static int eq_ggamma = 0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
101 static int eq_bgamma = 0;
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
102
16879
6ea220b10e8e More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents: 16751
diff changeset
103 static int texture_width;
6ea220b10e8e More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents: 16751
diff changeset
104 static int texture_height;
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17127
diff changeset
105 static int mpi_flipped;
18996
49f158e94fce vo_gl can do flipping without special filter
reimar
parents: 18995
diff changeset
106 static int vo_flipped;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
107
13237
f85c105bfeaa improved suboption parsing, fixes also compiler warnings
reimar
parents: 13206
diff changeset
108 static unsigned int slice_height = 1;
8654
2c4cebb8637d - optional slice height for -vo gl (example: -vo gl:32)
arpi
parents: 8148
diff changeset
109
612
77e0094f0cce some warnings killed
szabii
parents: 384
diff changeset
110 static void resize(int x,int y){
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
111 mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y);
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
112 if (WinID >= 0) {
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
113 int top = 0, left = 0, w = x, h = y;
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
114 geometry(&top, &left, &w, &h, vo_screenwidth, vo_screenheight);
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
115 glViewport(top, left, w, h);
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
116 } else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
117 glViewport( 0, 0, x, y );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
118
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119 glMatrixMode(GL_PROJECTION);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
120 glLoadIdentity();
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
121 if (vo_fs && use_aspect) {
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
122 int new_w, new_h;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
123 GLdouble scale_x, scale_y;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
124 aspect(&new_w, &new_h, A_ZOOM);
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
125 panscan_calc();
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
126 new_w += vo_panscan_x;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
127 new_h += vo_panscan_y;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
128 scale_x = (GLdouble) new_w / (GLdouble) x;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
129 scale_y = (GLdouble) new_h / (GLdouble) y;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
130 glScaled(scale_x, scale_y, 1);
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
131 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
132 glOrtho(0, image_width, image_height, 0, -1,1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134 glMatrixMode(GL_MODELVIEW);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
135 glLoadIdentity();
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
136
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
137 if (!scaled_osd) {
15086
c9eee448e5b2 revert the previous commit, gl needs to reload the font immediately
henry
parents: 15080
diff changeset
138 #ifdef HAVE_FREETYPE
c9eee448e5b2 revert the previous commit, gl needs to reload the font immediately
henry
parents: 15080
diff changeset
139 // adjust font size to display size
c9eee448e5b2 revert the previous commit, gl needs to reload the font immediately
henry
parents: 15080
diff changeset
140 force_load_font = 1;
c9eee448e5b2 revert the previous commit, gl needs to reload the font immediately
henry
parents: 15080
diff changeset
141 #endif
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
142 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
143 }
16584
cd14a59031b7 Several bugfixes:
reimar
parents: 16488
diff changeset
144 if (vo_fs && use_aspect && !vo_doublebuffering)
cd14a59031b7 Several bugfixes:
reimar
parents: 16488
diff changeset
145 glClear(GL_COLOR_BUFFER_BIT);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
146 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
147
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
148 static void texSize(int w, int h, int *texw, int *texh) {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
149 if (use_rectangle) {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
150 *texw = w; *texh = h;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
151 } else {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
152 *texw = 32;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
153 while (*texw < w)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
154 *texw *= 2;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
155 *texh = 32;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
156 while (*texh < h)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
157 *texh *= 2;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
158 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
159 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
160
16595
b3a9fb41f475 fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents: 16593
diff changeset
161 //! maximum size of custom fragment program
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
162 #define MAX_CUSTOM_PROG_SIZE (1024 * 1024)
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
163 static void update_yuvconv(void) {
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
164 float bri = eq_bri / 100.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
165 float cont = (eq_cont + 100) / 100.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
166 float hue = eq_hue / 100.0 * 3.1415927;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
167 float sat = (eq_sat + 100) / 100.0;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
168 float rgamma = exp(log(8.0) * eq_rgamma / 100.0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
169 float ggamma = exp(log(8.0) * eq_ggamma / 100.0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
170 float bgamma = exp(log(8.0) * eq_bgamma / 100.0);
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
171 glSetupYUVConversion(gl_target, yuvconvtype, bri, cont, hue, sat,
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
172 rgamma, ggamma, bgamma,
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
173 texture_width, texture_height);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
174 if (custom_prog) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
175 FILE *f = fopen(custom_prog, "r");
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
176 if (!f)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
177 mp_msg(MSGT_VO, MSGL_WARN,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
178 "[gl] Could not read customprog %s\n", custom_prog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
179 else {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
180 char *prog = calloc(1, MAX_CUSTOM_PROG_SIZE + 1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
181 fread(prog, 1, MAX_CUSTOM_PROG_SIZE, f);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
182 fclose(f);
18653
5af43a16abc3 loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents: 18619
diff changeset
183 loadGPUProgram(GL_FRAGMENT_PROGRAM, prog);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
184 free(prog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
185 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
186 ProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 0,
18960
3aaed991e8cd More helpful ProgramEnvParameters.
reimar
parents: 18949
diff changeset
187 1.0 / texture_width, 1.0 / texture_height,
3aaed991e8cd More helpful ProgramEnvParameters.
reimar
parents: 18949
diff changeset
188 texture_width, texture_height);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
189 }
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
190 if (custom_tex) {
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
191 FILE *f = fopen(custom_tex, "r");
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
192 if (!f)
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
193 mp_msg(MSGT_VO, MSGL_WARN,
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
194 "[gl] Could not read customtex %s\n", custom_tex);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
195 else {
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
196 int width, height, maxval;
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
197 ActiveTexture(GL_TEXTURE3);
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
198 if (glCreatePPMTex(custom_trect?GL_TEXTURE_RECTANGLE:GL_TEXTURE_2D, 0,
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
199 custom_tlin?GL_LINEAR:GL_NEAREST,
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
200 f, &width, &height, &maxval))
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
201 ProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 1,
18960
3aaed991e8cd More helpful ProgramEnvParameters.
reimar
parents: 18949
diff changeset
202 1.0 / width, 1.0 / height, width, height);
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
203 else
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
204 mp_msg(MSGT_VO, MSGL_WARN,
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
205 "[gl] Error parsing customtex %s\n", custom_tex);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
206 fclose(f);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
207 ActiveTexture(GL_TEXTURE0);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
208 }
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
209 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
210 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
211
16436
31c643d16626 Add missing doxygen comment for clearOSD()
reimar
parents: 16434
diff changeset
212 /**
31c643d16626 Add missing doxygen comment for clearOSD()
reimar
parents: 16434
diff changeset
213 * \brief remove all OSD textures and display-lists, thus clearing it.
31c643d16626 Add missing doxygen comment for clearOSD()
reimar
parents: 16434
diff changeset
214 */
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
215 static void clearOSD(void) {
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
216 int i;
17871
29cce29b0cd9 do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents: 17566
diff changeset
217 if (!osdtexCnt)
29cce29b0cd9 do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents: 17566
diff changeset
218 return;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
219 glDeleteTextures(osdtexCnt, osdtex);
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
220 #ifndef FAST_OSD
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
221 glDeleteTextures(osdtexCnt, osdatex);
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
222 for (i = 0; i < osdtexCnt; i++)
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
223 glDeleteLists(osdaDispList[i], 1);
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
224 #endif
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
225 for (i = 0; i < osdtexCnt; i++)
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
226 glDeleteLists(osdDispList[i], 1);
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
227 osdtexCnt = 0;
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
228 }
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
229
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
230 /**
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
231 * \brief remove textures, display list and free memory used by EOSD
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
232 */
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
233 static void clearEOSD(void) {
19934
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
234 if (eosdDispList)
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
235 glDeleteLists(eosdDispList, 1);
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
236 eosdDispList = 0;
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
237 if (eosdtexCnt)
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
238 glDeleteTextures(eosdtexCnt, eosdtex);
864dcc4f0408 Modify clearEOSD to make experimenting easier
reimar
parents: 19933
diff changeset
239 eosdtexCnt = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
240 free(eosdtex);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
241 eosdtex = NULL;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
242 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
243
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
244 /**
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
245 * \brief construct display list from ass image list
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
246 * \param img image list to create OSD from.
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
247 * A value of NULL has the same effect as clearEOSD()
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
248 */
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
249 static void genEOSD(ass_image_t *img) {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
250 int sx, sy;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
251 int tinytexcur = 0;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
252 int smalltexcur = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
253 GLuint *curtex;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
254 GLint scale_type = (scaled_osd) ? GL_LINEAR : GL_NEAREST;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
255 ass_image_t *i;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
256 int cnt;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
257 clearEOSD();
19935
698b1d68ac83 Make genEOSD behaviour with NULL data more explicit
reimar
parents: 19934
diff changeset
258 if (!img)
698b1d68ac83 Make genEOSD behaviour with NULL data more explicit
reimar
parents: 19934
diff changeset
259 return;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
260 if (!largeeosdtex[0]) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
261 glGenTextures(2, largeeosdtex);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
262 BindTexture(gl_target, largeeosdtex[0]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
263 glCreateClearTex(gl_target, GL_ALPHA, scale_type, 512, 512, 0);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
264 BindTexture(gl_target, largeeosdtex[1]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
265 glCreateClearTex(gl_target, GL_ALPHA, scale_type, 512, 512, 0);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
266 }
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
267 for (i = img; i; i = i->next)
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
268 {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
269 if (i->w <= 0 || i->h <= 0 || i->stride < i->w)
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
270 continue;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
271 if (i->w < 16 && i->h < 16 && tinytexcur < 1024)
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
272 tinytexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
273 else if (i->w < 32 && i->h < 32 && smalltexcur < 256)
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
274 smalltexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
275 else
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
276 eosdtexCnt++;
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
277 }
20084
40313ebc35ac EOSD performance debugging info.
reimar
parents: 19939
diff changeset
278 mp_msg(MSGT_VO, MSGL_DBG2, "EOSD counts (tiny, small, all): %i, %i, %i\n",
40313ebc35ac EOSD performance debugging info.
reimar
parents: 19939
diff changeset
279 tinytexcur, smalltexcur, eosdtexCnt);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
280 if (eosdtexCnt) {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
281 eosdtex = calloc(eosdtexCnt, sizeof(GLuint));
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
282 glGenTextures(eosdtexCnt, eosdtex);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
283 }
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
284 tinytexcur = smalltexcur = 0;
19937
34796c9b8667 Cosmetics: move curtex++ out of for () into code body, needed for coming patch
reimar
parents: 19936
diff changeset
285 for (i = img, curtex = eosdtex; i; i = i->next) {
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
286 int x = 0, y = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
287 if (i->w <= 0 || i->h <= 0 || i->stride < i->w) {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
288 mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n");
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
289 continue;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
290 }
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
291 if (i->w < 16 && i->h < 16 && tinytexcur < 1024) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
292 x = (tinytexcur & 31) << 4;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
293 y = (tinytexcur >> 5) << 4;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
294 BindTexture(gl_target, largeeosdtex[0]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
295 tinytexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
296 } else if (i->w < 32 && i->h < 32 && smalltexcur < 256) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
297 x = (smalltexcur & 15) << 5;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
298 y = (smalltexcur >> 4) << 5;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
299 BindTexture(gl_target, largeeosdtex[1]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
300 smalltexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
301 } else {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
302 texSize(i->w, i->h, &sx, &sy);
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
303 BindTexture(gl_target, *curtex++);
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
304 glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 0);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
305 }
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
306 glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, i->bitmap, i->stride,
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
307 x, y, i->w, i->h, 0);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
308 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
309 eosdDispList = glGenLists(1);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
310 glNewList(eosdDispList, GL_COMPILE);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
311 tinytexcur = smalltexcur = 0;
19937
34796c9b8667 Cosmetics: move curtex++ out of for () into code body, needed for coming patch
reimar
parents: 19936
diff changeset
312 for (i = img, curtex = eosdtex; i; i = i->next) {
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
313 int x = 0, y = 0;
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
314 if (i->w <= 0 || i->h <= 0 || i->stride < i->w)
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
315 continue;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
316 glColor4ub(i->color >> 24, (i->color >> 16) & 0xff, (i->color >> 8) & 0xff, 255 - (i->color & 0xff));
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
317 if (i->w < 16 && i->h < 16 && tinytexcur < 1024) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
318 x = (tinytexcur & 31) << 4;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
319 y = (tinytexcur >> 5) << 4;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
320 sx = sy = 512;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
321 BindTexture(gl_target, largeeosdtex[0]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
322 tinytexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
323 } else if (i->w < 32 && i->h < 32 && smalltexcur < 256) {
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
324 x = (smalltexcur & 15) << 5;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
325 y = (smalltexcur >> 4) << 5;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
326 sx = sy = 512;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
327 BindTexture(gl_target, largeeosdtex[1]);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
328 smalltexcur++;
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
329 } else {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
330 texSize(i->w, i->h, &sx, &sy);
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
331 BindTexture(gl_target, *curtex++);
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
332 }
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
333 glDrawTex(i->dst_x, i->dst_y, i->w, i->h, x, y, i->w, i->h, sx, sy, use_rectangle == 1, 0, 0);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
334 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
335 glEndList();
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
336 BindTexture(gl_target, 0);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
337 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
338
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
339 /**
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
340 * \brief uninitialize OpenGL context, freeing textures, buffers etc.
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
341 */
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17220
diff changeset
342 static void uninitGl(void) {
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
343 int i = 0;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
344 if (DeletePrograms && fragprog)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
345 DeletePrograms(1, &fragprog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
346 fragprog = 0;
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
347 while (default_texs[i] != 0)
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
348 i++;
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
349 if (i)
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
350 glDeleteTextures(i, default_texs);
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
351 default_texs[0] = 0;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
352 clearOSD();
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
353 clearEOSD();
19938
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
354 if (largeeosdtex[0])
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
355 glDeleteTextures(2, largeeosdtex);
f862045246a9 Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents: 19937
diff changeset
356 largeeosdtex[0] = 0;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
357 if (DeleteBuffers && gl_buffer)
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
358 DeleteBuffers(1, &gl_buffer);
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
359 gl_buffer = 0; gl_buffersize = 0;
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
360 err_shown = 0;
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
361 }
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
362
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
363 /**
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
364 * \brief Initialize a (new or reused) OpenGL context.
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
365 * set global gl-related variables to their default values
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
366 */
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
367 static int initGl(uint32_t d_width, uint32_t d_height) {
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
368 texSize(image_width, image_height, &texture_width, &texture_height);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
369
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
370 glDisable(GL_BLEND);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
371 glDisable(GL_DEPTH_TEST);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
372 glDepthMask(GL_FALSE);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
373 glDisable(GL_CULL_FACE);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
374 glEnable(gl_target);
16458
c35ed5cdf07e Respect -nodouble even though it looks very bad.
reimar
parents: 16436
diff changeset
375 glDrawBuffer(vo_doublebuffering?GL_BACK:GL_FRONT);
17956
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
376 glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
377
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
378 mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n",
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
379 texture_width, texture_height);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
380
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
381 if (image_format == IMGFMT_YV12) {
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
382 int i;
18896
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
383 glGenTextures(21, default_texs);
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
384 default_texs[21] = 0;
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
385 for (i = 0; i < 7; i++) {
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
386 ActiveTexture(GL_TEXTURE1 + i);
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
387 BindTexture(GL_TEXTURE_2D, default_texs[i]);
18896
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
388 BindTexture(GL_TEXTURE_RECTANGLE, default_texs[i + 7]);
4f6312855a7d Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents: 18878
diff changeset
389 BindTexture(GL_TEXTURE_3D, default_texs[i + 14]);
18871
32743cc5f380 Make sure all texture units have a different texture bound.
reimar
parents: 18788
diff changeset
390 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
391 ActiveTexture(GL_TEXTURE1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
392 glCreateClearTex(gl_target, gl_texfmt, GL_LINEAR,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
393 texture_width / 2, texture_height / 2, 128);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
394 ActiveTexture(GL_TEXTURE2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
395 glCreateClearTex(gl_target, gl_texfmt, GL_LINEAR,
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
396 texture_width / 2, texture_height / 2, 128);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
397 switch (use_yuv) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
398 case YUV_CONVERSION_FRAGMENT_LOOKUP:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
399 case YUV_CONVERSION_FRAGMENT_POW:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
400 case YUV_CONVERSION_FRAGMENT:
18579
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18116
diff changeset
401 if (!GenPrograms || !BindProgram) {
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18116
diff changeset
402 mp_msg(MSGT_VO, MSGL_ERR, "[gl] fragment program functions missing!\n");
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18116
diff changeset
403 break;
fc3f25278021 Move/add checks to avoid crashes and make error messages less confusing
reimar
parents: 18116
diff changeset
404 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
405 GenPrograms(1, &fragprog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
406 BindProgram(GL_FRAGMENT_PROGRAM, fragprog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
407 break;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
408 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
409 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
410 BindTexture(gl_target, 0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
411 update_yuvconv();
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
412 }
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
413 glCreateClearTex(gl_target, gl_texfmt, GL_LINEAR,
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
414 texture_width, texture_height, 0);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
415
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
416 resize(d_width, d_height);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
417
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
418 glClearColor( 0.0f,0.0f,0.0f,0.0f );
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
419 glClear( GL_COLOR_BUFFER_BIT );
16271
03884f9a35cc Do not set SwapInterval for values < 0.
reimar
parents: 16268
diff changeset
420 if (SwapInterval && swap_interval >= 0)
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
421 SwapInterval(swap_interval);
13920
4d4c6ac44d55 missing return for InitGl function
reimar
parents: 13871
diff changeset
422 return 1;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
423 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
424
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
425 /* connect to server, create and map window,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
426 * allocate colors and (shared) memory
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
427 */
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
428 static int
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 7111
diff changeset
429 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
430 {
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
431 image_height = height;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
432 image_width = width;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
433 image_format = format;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
434 glFindFormat(format, NULL, &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
435
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
436 int_pause = 0;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
437 vo_flipped = !!(flags & VOFLAG_FLIPPING);
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
438
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
439 panscan_init();
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
440 aspect_save_orig(width,height);
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
441 aspect_save_prescale(d_width,d_height);
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
442 update_xinerama_info();
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
443
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
444 aspect(&d_width,&d_height,A_NOZOOM);
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
445 vo_dx = (int)(vo_screenwidth - d_width) / 2;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
446 vo_dy = (int)(vo_screenheight - d_height) / 2;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
447 geometry(&vo_dx, &vo_dy, &d_width, &d_height,
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
448 vo_screenwidth, vo_screenheight);
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
449 vo_dx += xinerama_x;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
450 vo_dy += xinerama_y;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
451 #ifdef HAVE_NEW_GUI
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
452 if (use_gui) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
453 // GUI creates and manages window for us
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
454 vo_dwidth = d_width;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
455 vo_dheight= d_height;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
456 guiGetEvent(guiSetShVideo, 0);
18949
51aeef9ada52 Improve windows gui support
reimar
parents: 18896
diff changeset
457 #ifndef GL_WIN32
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
458 goto glconfig;
18949
51aeef9ada52 Improve windows gui support
reimar
parents: 18896
diff changeset
459 #endif
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
460 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
461 #endif
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
462 #ifdef GL_WIN32
18079
f57317460375 fixes and cleanup for windows fullscreen switching (restore old position,
reimar
parents: 17956
diff changeset
463 if (!vo_w32_config(d_width, d_height, flags))
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
464 return -1;
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
465 #else
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
466 if (WinID >= 0) {
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
467 vo_window = WinID ? (Window)WinID : mRootWin;
16239
87da68468e6d Get events from -wid window.
reimar
parents: 16237
diff changeset
468 vo_x11_selectinput_witherr(mDisplay, vo_window,
87da68468e6d Get events from -wid window.
reimar
parents: 16237
diff changeset
469 StructureNotifyMask | KeyPressMask | PointerMotionMask |
87da68468e6d Get events from -wid window.
reimar
parents: 16237
diff changeset
470 ButtonPressMask | ButtonReleaseMask | ExposureMask);
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
471 goto glconfig;
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
472 }
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
473 if ( vo_window == None ) {
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
474 unsigned int fg, bg;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
475 XSizeHints hint;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
476 XVisualInfo *vinfo;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
477 XEvent xev;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
478
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
479 vo_fs = VO_FALSE;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
480
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
481 hint.x = vo_dx;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
482 hint.y = vo_dy;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
483 hint.width = d_width;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
484 hint.height = d_height;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
485 hint.flags = PPosition | PSize;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
486
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
487 /* Get some colors */
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
488 bg = WhitePixel(mDisplay, mScreen);
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
489 fg = BlackPixel(mDisplay, mScreen);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
490
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
491 /* Make the window */
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
492 vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib );
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
493 if (vinfo == NULL)
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
494 {
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
495 mp_msg(MSGT_VO, MSGL_ERR, "[gl] no GLX support present\n");
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
496 return -1;
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
497 }
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
498
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
499 vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vinfo->visual,
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
500 hint.x, hint.y, hint.width, hint.height, vinfo->depth,
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
501 XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone));
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
502
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
503 vo_x11_classhint( mDisplay,vo_window,"gl" );
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
504 vo_hidecursor(mDisplay,vo_window);
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
505
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
506 XSelectInput(mDisplay, vo_window, StructureNotifyMask);
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
507 /* Tell other applications about this window */
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
508 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
509 /* Map window. */
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
510 XMapWindow(mDisplay, vo_window);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
511
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
512 /* Wait for map. */
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
513 do {
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
514 XNextEvent(mDisplay, &xev);
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
515 } while (xev.type != MapNotify || xev.xmap.event != vo_window);
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
516
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
517 XSelectInput(mDisplay, vo_window, NoEventMask);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
518
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
519 XSync(mDisplay, False);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
520
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
521 vo_x11_selectinput_witherr(mDisplay, vo_window,
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
522 StructureNotifyMask | KeyPressMask | PointerMotionMask |
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
523 ButtonPressMask | ButtonReleaseMask | ExposureMask);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
524 }
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
525 if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
13575
d3ef52aafb54 fixed UNPACK_ALIGNMENT setting.
reimar
parents: 13237
diff changeset
526
15589
c3108031b78a Implement -geometry for vo gl and gl2.
reimar
parents: 15212
diff changeset
527 vo_x11_nofs_sizepos(vo_dx, vo_dy, d_width, d_height);
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
528 if (vo_fs ^ (flags & VOFLAG_FULLSCREEN))
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
529 vo_x11_fullscreen();
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
530 #endif
15748
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
531
f75ba7f7b7b2 support -wid
reimar
parents: 15719
diff changeset
532 glconfig:
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
533 if (vo_config_count)
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
534 uninitGl();
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
535 setGlWindow(&gl_vinfo, &gl_context, vo_window);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
536 initGl(vo_dwidth, vo_dheight);
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
537
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
538 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
539 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
540
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
541 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
542 {
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17027
diff changeset
543 int e=vo_check_events();
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
544 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
545 if(e&VO_EVENT_EXPOSE && int_pause) flip_page();
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
546 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
547
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
548 /**
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
549 * Creates the textures and the display list needed for displaying
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
550 * an OSD part.
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
551 * Callback function for vo_draw_text().
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
552 */
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
553 static void create_osd_texture(int x0, int y0, int w, int h,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
554 unsigned char *src, unsigned char *srca,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
555 int stride)
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
556 {
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
557 // 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
558 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
559 GLint scale_type = (scaled_osd) ? GL_LINEAR : GL_NEAREST;
17875
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
560
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
561 if (w <= 0 || h <= 0 || stride < w) {
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
562 mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n");
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
563 return;
3bf109509189 extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents: 17871
diff changeset
564 }
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
565 texSize(w, h, &sx, &sy);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
566
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
567 if (osdtexCnt >= MAX_OSD_PARTS) {
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
568 mp_msg(MSGT_VO, MSGL_ERR, "Too many OSD parts, contact the developers!\n");
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
569 return;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
570 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
571
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
572 // create Textures for OSD part
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
573 glGenTextures(1, &osdtex[osdtexCnt]);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
574 BindTexture(gl_target, osdtex[osdtexCnt]);
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
575 glCreateClearTex(gl_target, GL_LUMINANCE, scale_type, sx, sy, 0);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
576 glUploadTex(gl_target, GL_LUMINANCE, GL_UNSIGNED_BYTE, src, stride,
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
577 0, 0, w, h, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
578
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
579 #ifndef FAST_OSD
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
580 glGenTextures(1, &osdatex[osdtexCnt]);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
581 BindTexture(gl_target, osdatex[osdtexCnt]);
16584
cd14a59031b7 Several bugfixes:
reimar
parents: 16488
diff changeset
582 glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 255);
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
583 {
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16214
diff changeset
584 int i;
18878
3bf0d70b4c7f rm unnecesary casts from void* - part 2
reynaldo
parents: 18872
diff changeset
585 char *tmp = malloc(stride * h);
16272
3934a31bcce4 less weird OSD alpha transformation.
reimar
parents: 16271
diff changeset
586 // convert alpha from weird MPlayer scale.
3934a31bcce4 less weird OSD alpha transformation.
reimar
parents: 16271
diff changeset
587 // in-place is not possible since it is reused for future OSDs
20420
0c63edaa7714 Fix single-black-pixel-in-upper-left-corner bug (how do people notice a single
reimar
parents: 20084
diff changeset
588 for (i = h * stride - 1; i >= 0; i--)
16272
3934a31bcce4 less weird OSD alpha transformation.
reimar
parents: 16271
diff changeset
589 tmp[i] = srca[i] - 1;
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
590 glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, tmp, stride,
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
591 0, 0, w, h, 0);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
592 free(tmp);
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
593 }
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
594 #endif
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
595
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
596 BindTexture(gl_target, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
597
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
598 // Create a list for rendering this OSD part
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
599 #ifndef FAST_OSD
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
600 osdaDispList[osdtexCnt] = glGenLists(1);
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
601 glNewList(osdaDispList[osdtexCnt], GL_COMPILE);
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
602 // render alpha
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
603 BindTexture(gl_target, osdatex[osdtexCnt]);
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
604 glDrawTex(x0, y0, w, h, 0, 0, w, h, sx, sy, use_rectangle == 1, 0, 0);
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
605 glEndList();
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
606 #endif
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
607 osdDispList[osdtexCnt] = glGenLists(1);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
608 glNewList(osdDispList[osdtexCnt], GL_COMPILE);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
609 // render OSD
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
610 BindTexture(gl_target, osdtex[osdtexCnt]);
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17127
diff changeset
611 glDrawTex(x0, y0, w, h, 0, 0, w, h, sx, sy, use_rectangle == 1, 0, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
612 glEndList();
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
613
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
614 osdtexCnt++;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
615 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
616
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1302
diff changeset
617 static void draw_osd(void)
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1302
diff changeset
618 {
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
619 if (!use_osd) return;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
620 if (vo_osd_changed(0)) {
16221
a8063634ebd1 remove/move some unused headers/variables/code
reimar
parents: 16214
diff changeset
621 int osd_h, osd_w;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
622 clearOSD();
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
623 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
624 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
625 vo_draw_text(osd_w, osd_h, create_osd_texture);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
626 }
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1302
diff changeset
627 }
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
628
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
629 static void
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
630 flip_page(void)
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
631 {
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
632 // glEnable(GL_TEXTURE_2D);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
633 // glBindTexture(GL_TEXTURE_2D, texture_id);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
634
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
635 glColor3f(1,1,1);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
636 if (image_format == IMGFMT_YV12)
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
637 glEnableYUVConversion(gl_target, yuvconvtype);
16584
cd14a59031b7 Several bugfixes:
reimar
parents: 16488
diff changeset
638 glDrawTex(0, 0, image_width, image_height,
cd14a59031b7 Several bugfixes:
reimar
parents: 16488
diff changeset
639 0, 0, image_width, image_height,
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
640 texture_width, texture_height,
18996
49f158e94fce vo_gl can do flipping without special filter
reimar
parents: 18995
diff changeset
641 use_rectangle == 1, image_format == IMGFMT_YV12,
49f158e94fce vo_gl can do flipping without special filter
reimar
parents: 18995
diff changeset
642 mpi_flipped ^ vo_flipped);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
643 if (image_format == IMGFMT_YV12)
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
644 glDisableYUVConversion(gl_target, yuvconvtype);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
645
19936
f810e12fce63 use eosdDispList != 0 to check if eosd should be drawn instead of eosdtexCnt > 0
reimar
parents: 19935
diff changeset
646 if (osdtexCnt > 0 || eosdDispList) {
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
647 // 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
648 if (!scaled_osd) {
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
649 glMatrixMode(GL_PROJECTION);
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
650 glPushMatrix();
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
651 glLoadIdentity();
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
652 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
653 }
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
654 glEnable(GL_BLEND);
19936
f810e12fce63 use eosdDispList != 0 to check if eosd should be drawn instead of eosdtexCnt > 0
reimar
parents: 19935
diff changeset
655 if (eosdDispList) {
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
656 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
657 glCallList(eosdDispList);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
658 }
19579
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
659 if (osdtexCnt > 0) {
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
660 glColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff);
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
661 // draw OSD
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
662 #ifndef FAST_OSD
19579
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
663 glBlendFunc(GL_ZERO, GL_SRC_ALPHA);
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
664 glCallLists(osdtexCnt, GL_UNSIGNED_INT, osdaDispList);
18719
5d01eb066fa3 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents: 18695
diff changeset
665 #endif
19579
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
666 glBlendFunc(GL_ONE, GL_ONE);
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
667 glCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList);
c4f5738248ac Cosmetics: fix indentation after last patch
reimar
parents: 19578
diff changeset
668 }
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
669 // set rendering parameters back to defaults
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
670 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
671 if (!scaled_osd)
19939
1eb8f5470cba Whitespace-only cosmetics
reimar
parents: 19938
diff changeset
672 glPopMatrix();
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
673 BindTexture(gl_target, 0);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
674 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
675
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
676 if (use_glFinish)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
677 glFinish();
16458
c35ed5cdf07e Respect -nodouble even though it looks very bad.
reimar
parents: 16436
diff changeset
678 if (vo_doublebuffering)
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17027
diff changeset
679 swapGlBuffers();
17117
6e3602d994a6 Must use glFlush when doublebuffering is not used
reimar
parents: 17116
diff changeset
680 else if (!use_glFinish)
6e3602d994a6 Must use glFlush when doublebuffering is not used
reimar
parents: 17116
diff changeset
681 glFlush();
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
682
16458
c35ed5cdf07e Respect -nodouble even though it looks very bad.
reimar
parents: 16436
diff changeset
683 if (vo_fs && use_aspect && vo_doublebuffering)
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
684 glClear(GL_COLOR_BUFFER_BIT);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
685 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
686
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
687 //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
688 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
689 {
17220
a27e52b838e3 support negative stride (flipping) in vo_gl.
reimar
parents: 17127
diff changeset
690 mpi_flipped = (stride[0] < 0);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
691 glUploadTex(gl_target, gl_format, gl_type, src[0], stride[0],
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
692 x, y, w, h, slice_height);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
693 if (image_format == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
694 ActiveTexture(GL_TEXTURE1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
695 glUploadTex(gl_target, gl_format, gl_type, src[1], stride[1],
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
696 x / 2, y / 2, w / 2, h / 2, slice_height);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
697 ActiveTexture(GL_TEXTURE2);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
698 glUploadTex(gl_target, gl_format, gl_type, src[2], stride[2],
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
699 x / 2, y / 2, w / 2, h / 2, slice_height);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
700 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
701 }
19580
dd2312f887a6 Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents: 19579
diff changeset
702 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
703 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
704
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
705 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
706 if (!GenBuffers || !BindBuffer || !BufferData || !MapBuffer) {
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
707 if (!err_shown)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
708 mp_msg(MSGT_VO, MSGL_ERR, "[gl] extensions missing for dr\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
709 "Expect a _major_ speed penalty\n");
16113
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
710 err_shown = 1;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
711 return VO_FALSE;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
712 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
713 if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE;
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
714 if (mpi->type == MP_IMGTYPE_IP || mpi->type == MP_IMGTYPE_IPB)
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
715 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
716 if (!gl_buffer)
f00a2826ee11 use GenBuffers to get a buffer number instead of hardcoding 1.
reimar
parents: 16221
diff changeset
717 GenBuffers(1, &gl_buffer);
f00a2826ee11 use GenBuffers to get a buffer number instead of hardcoding 1.
reimar
parents: 16221
diff changeset
718 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
719 mpi->stride[0] = mpi->width * mpi->bpp / 8;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
720 if (mpi->stride[0] * mpi->h > gl_buffersize) {
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
721 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
722 NULL, GL_DYNAMIC_DRAW);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
723 gl_buffersize = mpi->stride[0] * mpi->h;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
724 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
725 mpi->planes[0] = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
726 BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
16113
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
727 if (mpi->planes[0] == NULL) {
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
728 if (!err_shown)
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
729 mp_msg(MSGT_VO, MSGL_ERR, "[gl] could not aquire buffer for dr\n"
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
730 "Expect a _major_ speed penalty\n");
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
731 err_shown = 1;
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
732 return VO_FALSE;
c81b7c1c14cb catch failed buffer allocation
reimar
parents: 16109
diff changeset
733 }
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
734 if (mpi->imgfmt == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
735 // YV12
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
736 mpi->flags |= MP_IMGFLAG_COMMON_STRIDE | MP_IMGFLAG_COMMON_PLANE;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
737 mpi->stride[0] = mpi->width;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
738 mpi->planes[1] = mpi->planes[0] + mpi->stride[0] * mpi->height;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
739 mpi->stride[1] = mpi->width >> 1;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
740 mpi->planes[2] = mpi->planes[1] + mpi->stride[1] * (mpi->height >> 1);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
741 mpi->stride[2] = mpi->width >> 1;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
742 }
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
743 mpi->flags |= MP_IMGFLAG_DIRECT;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
744 return VO_TRUE;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
745 }
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
746
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
747 static uint32_t draw_image(mp_image_t *mpi) {
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
748 int slice = slice_height;
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
749 int stride[3] = {mpi->stride[0], mpi->stride[1], mpi->stride[2]};
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
750 unsigned char *planes[3] = {mpi->planes[0], mpi->planes[1], mpi->planes[2]};
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
751 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
752 return VO_TRUE;
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
753 mpi_flipped = (stride[0] < 0);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
754 if (mpi->flags & MP_IMGFLAG_DIRECT) {
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
755 intptr_t base = (intptr_t)planes[0];
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
756 if (mpi_flipped)
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
757 base += (mpi->h - 1) * stride[0];
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
758 planes[0] -= base;
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
759 planes[1] -= base;
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
760 planes[2] -= base;
16233
f00a2826ee11 use GenBuffers to get a buffer number instead of hardcoding 1.
reimar
parents: 16221
diff changeset
761 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer);
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
762 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
763 slice = 0; // always "upload" full texture
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
764 }
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
765 glUploadTex(gl_target, gl_format, gl_type, planes[0], stride[0],
16117
d280ec2b9e63 More helper functions/defines and bugfixes
reimar
parents: 16113
diff changeset
766 mpi->x, mpi->y, mpi->w, mpi->h, slice);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
767 if (mpi->imgfmt == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
768 ActiveTexture(GL_TEXTURE1);
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
769 glUploadTex(gl_target, gl_format, gl_type, planes[1], stride[1],
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
770 mpi->x / 2, mpi->y / 2, mpi->w / 2, mpi->h / 2, slice);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
771 ActiveTexture(GL_TEXTURE2);
18995
46bf025408c3 Fix negative stride handling in -dr case
reimar
parents: 18994
diff changeset
772 glUploadTex(gl_target, gl_format, gl_type, planes[2], stride[2],
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
773 mpi->x / 2, mpi->y / 2, mpi->w / 2, mpi->h / 2, slice);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
774 ActiveTexture(GL_TEXTURE0);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
775 }
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
776 if (mpi->flags & MP_IMGFLAG_DIRECT)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
777 BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
778 return VO_TRUE;
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
779 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
780
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
781 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
782 draw_frame(uint8_t *src[])
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
783 {
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
784 return VO_ERROR;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
785 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
786
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
787 static int
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
788 query_format(uint32_t format)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
789 {
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
790 int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW |
18996
49f158e94fce vo_gl can do flipping without special filter
reimar
parents: 18995
diff changeset
791 VFCAP_FLIP |
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
792 VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
793 if (use_osd)
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
794 caps |= VFCAP_OSD | VFCAP_EOSD;
13206
6e8d1ac141fc Using updated colorspace specifications from colorspaces.txt.
reimar
parents: 13188
diff changeset
795 if ((format == IMGFMT_RGB24) || (format == IMGFMT_RGBA))
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
796 return caps;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
797 if (use_yuv && format == IMGFMT_YV12)
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
798 return caps;
19356
595ac8077dc5 Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents: 18996
diff changeset
799 // HACK, otherwise we get only b&w with some filters (e.g. -vf eq)
595ac8077dc5 Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents: 18996
diff changeset
800 // ideally MPlayer should be fixed instead not to use Y800 when it has the choice
595ac8077dc5 Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents: 18996
diff changeset
801 if (!use_yuv && (format == IMGFMT_Y8 || format == IMGFMT_Y800))
595ac8077dc5 Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents: 18996
diff changeset
802 return 0;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13993
diff changeset
803 if (many_fmts &&
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13993
diff changeset
804 glFindFormat(format, NULL, NULL, NULL, NULL))
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
805 return caps;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
806 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
807 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
808
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
809
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
810 static void
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
811 uninit(void)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
812 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
813 if ( !vo_config_count ) return;
16433
1deef0daf3aa Add an uninit function.
reimar
parents: 16397
diff changeset
814 uninitGl();
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
815 releaseGlContext(&gl_vinfo, &gl_context);
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
816 if (custom_prog) free(custom_prog);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
817 custom_prog = NULL;
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
818 if (custom_tex) free(custom_tex);
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
819 custom_tex = NULL;
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17027
diff changeset
820 vo_uninit();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
821 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
822
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
823 static opt_t subopts[] = {
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
824 {"manyfmts", OPT_ARG_BOOL, &many_fmts, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
825 {"osd", OPT_ARG_BOOL, &use_osd, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
826 {"scaled-osd", OPT_ARG_BOOL, &scaled_osd, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
827 {"aspect", OPT_ARG_BOOL, &use_aspect, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
828 {"slice-height", OPT_ARG_INT, &slice_height, (opt_test_f)int_non_neg},
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
829 {"rectangle", OPT_ARG_INT, &use_rectangle,(opt_test_f)int_non_neg},
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
830 {"yuv", OPT_ARG_INT, &use_yuv, (opt_test_f)int_non_neg},
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
831 {"lscale", OPT_ARG_INT, &lscale, (opt_test_f)int_non_neg},
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
832 {"cscale", OPT_ARG_INT, &cscale, (opt_test_f)int_non_neg},
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
833 {"glfinish", OPT_ARG_BOOL, &use_glFinish, NULL},
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
834 {"swapinterval", OPT_ARG_INT, &swap_interval,NULL},
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
835 {"customprog", OPT_ARG_MSTRZ,&custom_prog, NULL},
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
836 {"customtex", OPT_ARG_MSTRZ,&custom_tex, NULL},
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
837 {"customtlin", OPT_ARG_BOOL, &custom_tlin, NULL},
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
838 {"customtrect", OPT_ARG_BOOL, &custom_trect, NULL},
17956
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
839 {"osdcolor", OPT_ARG_INT, &osd_color, NULL},
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
840 {NULL}
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
841 };
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
842
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
843 static int preinit(const char *arg)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
844 {
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
845 // set defaults
16012
f9e53883dfd2 Enable manyfmts by default for vo_gl
reimar
parents: 15748
diff changeset
846 many_fmts = 1;
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
847 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
848 scaled_osd = 0;
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
849 use_aspect = 1;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
850 use_yuv = 0;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
851 lscale = 0;
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
852 cscale = 0;
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
853 use_rectangle = 0;
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
854 use_glFinish = 0;
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
855 swap_interval = 1;
17027
04d66a417413 Use slice-height 16 as default for yuv colorspaces (only relevant if decoder
reimar
parents: 17006
diff changeset
856 slice_height = -1;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
857 custom_prog = NULL;
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
858 custom_tex = NULL;
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
859 custom_tlin = 1;
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
860 custom_trect = 0;
17956
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
861 osd_color = 0xffffff;
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
862 if (subopt_parse(arg, subopts) != 0) {
13237
f85c105bfeaa improved suboption parsing, fixes also compiler warnings
reimar
parents: 13206
diff changeset
863 mp_msg(MSGT_VO, MSGL_FATAL,
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
864 "\n-vo gl command line help:\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
865 "Example: mplayer -vo gl:slice-height=4\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
866 "\nOptions:\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
867 " manyfmts\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
868 " Enable extended color formats for OpenGL 1.2 and later\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
869 " slice-height=<0-...>\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
870 " Slice size for texture transfer, 0 for whole image\n"
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
871 " noosd\n"
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
872 " Do not use OpenGL OSD code\n"
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
873 " noaspect\n"
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
874 " Do not do aspect scaling\n"
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
875 " rectangle=<0,1,2>\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
876 " 0: use power-of-two textures\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
877 " 1: use texture_rectangle\n"
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
878 " 2: use texture_non_power_of_two\n"
16235
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
879 " glfinish\n"
6a72f27e88d5 Make glFinish optional
reimar
parents: 16233
diff changeset
880 " Call glFinish() before swapping buffers\n"
16268
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
881 " swapinterval=<n>\n"
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
882 " Interval in displayed frames between to buffer swaps.\n"
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
883 " 1 is equivalent to enable VSYNC, 0 to disable VSYNC.\n"
d7856c2232d0 automatic vsync enabling for vo_gl.
reimar
parents: 16239
diff changeset
884 " Requires GLX_SGI_swap_control support to work.\n"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
885 " yuv=<n>\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
886 " 0: use software YUV to RGB conversion.\n"
16626
b36b5bb95a9b documentation update.
reimar
parents: 16595
diff changeset
887 " 1: use register combiners (nVidia only, for older cards).\n"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
888 " 2: use fragment program.\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
889 " 3: use fragment program with gamma correction.\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
890 " 4: use fragment program with gamma correction via lookup.\n"
16626
b36b5bb95a9b documentation update.
reimar
parents: 16595
diff changeset
891 " 5: use ATI-specific method (for older cards).\n"
18695
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
892 " lscale=<n>\n"
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
893 " 0: use standard bilinear scaling for luma.\n"
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
894 " 1: use improved bicubic scaling for luma.\n"
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
895 " cscale=<n>\n"
96b0da901a7d Document lscale/cscale in -vo gl:help message
reimar
parents: 18653
diff changeset
896 " as lscale but for chroma (2x slower with little visible effect).\n"
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
897 " customprog=<filename>\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
898 " use a custom YUV conversion program\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
899 " customtex=<filename>\n"
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
900 " use a custom YUV conversion lookup texture\n"
16593
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
901 " nocustomtlin\n"
1c13fb2ba5a9 Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents: 16586
diff changeset
902 " use GL_NEAREST scaling for customtex texture\n"
18963
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
903 " customtrect\n"
50ded49812b9 customtrect -vo gl suboption
reimar
parents: 18960
diff changeset
904 " use texture_rectangle for customtex texture\n"
17956
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
905 " osdcolor=<0xRRGGBB>\n"
0c5b35855061 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
reimar
parents: 17875
diff changeset
906 " use the given color for the OSD\n"
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
907 "\n" );
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
908 return -1;
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
909 }
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
910 if (use_rectangle == 1)
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
911 gl_target = GL_TEXTURE_RECTANGLE;
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
912 else
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
913 gl_target = GL_TEXTURE_2D;
17027
04d66a417413 Use slice-height 16 as default for yuv colorspaces (only relevant if decoder
reimar
parents: 17006
diff changeset
914 if (slice_height == -1)
04d66a417413 Use slice-height 16 as default for yuv colorspaces (only relevant if decoder
reimar
parents: 17006
diff changeset
915 slice_height = use_yuv ? 16 : 4;
18619
106a0c366002 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents: 18579
diff changeset
916 yuvconvtype = use_yuv | lscale << YUV_LUM_SCALER_SHIFT | cscale << YUV_CHROM_SCALER_SHIFT;
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
917 if (many_fmts)
16751
d9465442eef2 Be less verbose.
reimar
parents: 16626
diff changeset
918 mp_msg (MSGT_VO, MSGL_INFO, "[gl] using extended formats. "
16880
1267964a4dfa 10l typo, nomanyfmts should be used against playback problems.
reimar
parents: 16879
diff changeset
919 "Use -vo gl:nomanyfmts if playback fails.\n");
16751
d9465442eef2 Be less verbose.
reimar
parents: 16626
diff changeset
920 mp_msg (MSGT_VO, MSGL_V, "[gl] Using %d as slice height "
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
921 "(0 means image height).\n", slice_height);
7931
48c71b6c7389 vo_init() moved to/fixed in preinit()
arpi
parents: 7777
diff changeset
922 if( !vo_init() ) return -1; // Can't open X11
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
923
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
924 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
925 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
926
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16117
diff changeset
927 static int control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
928 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
929 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
930 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
931 case VOCTRL_RESUME: return (int_pause=0);
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
932 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
933 return query_format(*((uint32_t*)data));
16099
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
934 case VOCTRL_GET_IMAGE:
629c54dc7e0d support for rectangular and streaming textures.
reimar
parents: 16092
diff changeset
935 return get_image(data);
16092
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
936 case VOCTRL_DRAW_IMAGE:
26f5936c3fa3 Use DRAW_IMAGE instead of draw_frame
reimar
parents: 16012
diff changeset
937 return draw_image(data);
19578
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
938 case VOCTRL_DRAW_EOSD:
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
939 genEOSD(data);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
940 return VO_TRUE;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
941 case VOCTRL_GET_EOSD_RES:
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
942 {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
943 mp_eosd_res_t *r = data;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
944 r->mt = r->mb = r->ml = r->mr = 0;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
945 if (scaled_osd) {r->w = image_width; r->h = image_height;}
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
946 else if (vo_fs) {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
947 int aw, ah;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
948 aspect(&aw, &ah, A_ZOOM);
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
949 r->w = vo_screenwidth; r->h = vo_screenheight;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
950 r->ml = r->mr = (vo_screenwidth - aw) / 2;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
951 r->mt = r->mb = (vo_screenheight - ah) / 2;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
952 } else {
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
953 r->w = vo_dwidth; r->h = vo_dheight;
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
954 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
955 }
dd29709e7a1b Hardware EOSD (ass) support.
reimar
parents: 19356
diff changeset
956 return VO_TRUE;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
957 case VOCTRL_GUISUPPORT:
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
958 return VO_TRUE;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
959 case VOCTRL_ONTOP:
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17027
diff changeset
960 vo_ontop();
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
961 return VO_TRUE;
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
962 case VOCTRL_FULLSCREEN:
17116
724353364790 Get rid of most #ifdefs
reimar
parents: 17027
diff changeset
963 vo_fullscreen();
16109
519a307e3ccf OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents: 16099
diff changeset
964 resize(vo_dwidth, vo_dheight);
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
965 return VO_TRUE;
17006
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16880
diff changeset
966 #ifdef GL_WIN32
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16880
diff changeset
967 case VOCTRL_BORDER:
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16880
diff changeset
968 vo_w32_border();
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16880
diff changeset
969 return VO_TRUE;
852499addaa8 Enable border toggling for gl and gl2 under windows.
reimar
parents: 16880
diff changeset
970 #endif
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
971 case VOCTRL_GET_PANSCAN:
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
972 if (!use_aspect) return VO_NOTIMPL;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
973 return VO_TRUE;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
974 case VOCTRL_SET_PANSCAN:
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
975 if (!use_aspect) return VO_NOTIMPL;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
976 resize (vo_dwidth, vo_dheight);
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
977 return VO_TRUE;
16488
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
978 case VOCTRL_GET_EQUALIZER:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
979 if (image_format == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
980 va_list va;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
981 int *value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
982 va_start(va, data);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
983 value = va_arg(va, int *);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
984 va_end(va);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
985 if (strcasecmp(data, "brightness") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
986 *value = eq_bri;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
987 if (use_yuv == YUV_CONVERSION_COMBINERS) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
988 } else if (strcasecmp(data, "contrast") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
989 *value = eq_cont;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
990 if (use_yuv == YUV_CONVERSION_COMBINERS) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
991 } else if (strcasecmp(data, "saturation") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
992 *value = eq_sat;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
993 } else if (strcasecmp(data, "hue") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
994 *value = eq_hue;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
995 } else if (strcasecmp(data, "gamma") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
996 *value = eq_rgamma;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
997 if (use_yuv == YUV_CONVERSION_COMBINERS ||
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
998 use_yuv == YUV_CONVERSION_FRAGMENT) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
999 } else if (strcasecmp(data, "red_gamma") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1000 *value = eq_rgamma;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1001 if (use_yuv == YUV_CONVERSION_COMBINERS ||
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1002 use_yuv == YUV_CONVERSION_FRAGMENT) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1003 } else if (strcasecmp(data, "green_gamma") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1004 *value = eq_ggamma;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1005 if (use_yuv == YUV_CONVERSION_COMBINERS ||
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1006 use_yuv == YUV_CONVERSION_FRAGMENT) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1007 } else if (strcasecmp(data, "blue_gamma") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1008 *value = eq_bgamma;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1009 if (use_yuv == YUV_CONVERSION_COMBINERS ||
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1010 use_yuv == YUV_CONVERSION_FRAGMENT) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1011 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1012 return VO_TRUE;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1013 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1014 break;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1015 case VOCTRL_SET_EQUALIZER:
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1016 if (image_format == IMGFMT_YV12) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1017 va_list va;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1018 int value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1019 va_start(va, data);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1020 value = va_arg(va, int);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1021 va_end(va);
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1022 if (strcasecmp(data, "brightness") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1023 eq_bri = value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1024 if (use_yuv == YUV_CONVERSION_COMBINERS) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1025 } else if (strcasecmp(data, "contrast") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1026 eq_cont = value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1027 if (use_yuv == YUV_CONVERSION_COMBINERS) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1028 } else if (strcasecmp(data, "saturation") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1029 eq_sat = value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1030 } else if (strcasecmp(data, "hue") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1031 eq_hue = value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1032 } else if (strcasecmp(data, "gamma") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1033 eq_rgamma = eq_ggamma = eq_bgamma = value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1034 if (use_yuv == YUV_CONVERSION_COMBINERS ||
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1035 use_yuv == YUV_CONVERSION_FRAGMENT) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1036 } else if (strcasecmp(data, "red_gamma") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1037 eq_rgamma = value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1038 if (use_yuv == YUV_CONVERSION_COMBINERS ||
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1039 use_yuv == YUV_CONVERSION_FRAGMENT) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1040 } else if (strcasecmp(data, "green_gamma") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1041 eq_ggamma = value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1042 if (use_yuv == YUV_CONVERSION_COMBINERS ||
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1043 use_yuv == YUV_CONVERSION_FRAGMENT) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1044 } else if (strcasecmp(data, "blue_gamma") == 0) {
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1045 eq_bgamma = value;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1046 if (use_yuv == YUV_CONVERSION_COMBINERS ||
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1047 use_yuv == YUV_CONVERSION_FRAGMENT) break; // not supported
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1048 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1049 update_yuvconv();
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1050 return VO_TRUE;
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1051 }
3191dcb27a12 hardware color-space conversion for vo_gl and vo_gl2
reimar
parents: 16474
diff changeset
1052 break;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
1053 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
1054 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
1055 }