Mercurial > mplayer.hg
annotate libvo/vo_gl.c @ 36179:512629a9aa21
vo_gl: Extract some code into separate function.
This should make it less messy to support other ways
to do direct rendering.
author | reimar |
---|---|
date | Thu, 16 May 2013 19:57:32 +0000 |
parents | 94979f661d38 |
children | 3b15983f5e48 |
rev | line source |
---|---|
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
1 /* |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
2 * This file is part of MPlayer. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
3 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
7 * (at your option) any later version. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
8 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
12 * GNU General Public License for more details. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
13 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
31309
1a35ec7c45e0
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
reimar
parents:
31274
diff
changeset
|
17 * |
1a35ec7c45e0
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
reimar
parents:
31274
diff
changeset
|
18 * You can alternatively redistribute this file and/or |
1a35ec7c45e0
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
reimar
parents:
31274
diff
changeset
|
19 * modify it under the terms of the GNU Lesser General Public |
1a35ec7c45e0
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
reimar
parents:
31274
diff
changeset
|
20 * License as published by the Free Software Foundation; either |
1a35ec7c45e0
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
reimar
parents:
31274
diff
changeset
|
21 * version 2.1 of the License, or (at your option) any later version. |
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
22 */ |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28424
diff
changeset
|
23 |
1 | 24 #include <stdio.h> |
25 #include <stdlib.h> | |
26 #include <string.h> | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
27 #include <math.h> |
1 | 28 |
16221 | 29 #include "config.h" |
32461 | 30 #include "sub/ass_mp.h" |
11988 | 31 #include "mp_msg.h" |
14286 | 32 #include "subopt-helper.h" |
1 | 33 #include "video_out.h" |
34 #include "video_out_internal.h" | |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
35 #include "libmpcodecs/vf.h" |
32466
9e627a1793b1
Move font_load.[ch], font_load_ft.c and osd_font.h from libvo to sub.
cigaes
parents:
32461
diff
changeset
|
36 #include "sub/font_load.h" |
32467 | 37 #include "sub/sub.h" |
1 | 38 |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
39 #include "gl_common.h" |
2057 | 40 #include "aspect.h" |
26681 | 41 #include "fastmemcpy.h" |
32460 | 42 #include "sub/eosd.h" |
31 | 43 |
31022 | 44 #ifdef CONFIG_GL_SDL |
34812 | 45 #include "sdl_common.h" |
31022 | 46 #endif |
47 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28939
diff
changeset
|
48 static const vo_info_t info = |
1 | 49 { |
30721
e41d1c03cea4
Update -vo gl info structs, it isn't X11-only since ages and there's basically
reimar
parents:
30720
diff
changeset
|
50 "OpenGL", |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
51 "gl", |
30721
e41d1c03cea4
Update -vo gl info structs, it isn't X11-only since ages and there's basically
reimar
parents:
30720
diff
changeset
|
52 "Reimar Doeffinger <Reimar.Doeffinger@gmx.de>", |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
53 "" |
1 | 54 }; |
55 | |
25220
c9e9ac2008c2
Mark the vo_functions_t definitions as const where possible.
reimar
parents:
25216
diff
changeset
|
56 const LIBVO_EXTERN(gl) |
8148
5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
alex
parents:
7931
diff
changeset
|
57 |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
58 |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
59 static const vo_info_t info_nosw = |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
60 { |
30721
e41d1c03cea4
Update -vo gl info structs, it isn't X11-only since ages and there's basically
reimar
parents:
30720
diff
changeset
|
61 "OpenGL no software rendering", |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
62 "gl_nosw", |
30721
e41d1c03cea4
Update -vo gl info structs, it isn't X11-only since ages and there's basically
reimar
parents:
30720
diff
changeset
|
63 "Reimar Doeffinger <Reimar.Doeffinger@gmx.de>", |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
64 "" |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
65 }; |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
66 static int preinit_nosw(const char *arg); |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
67 #define info info_nosw |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
68 #define preinit preinit_nosw |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
69 const LIBVO_EXTERN(gl_nosw) |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
70 #undef info |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
71 #undef preinit |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
72 |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
73 static MPGLContext glctx; |
1 | 74 |
13599 | 75 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
|
76 static int scaled_osd; |
14269 | 77 //! How many parts the OSD may consist of at most |
13585 | 78 #define MAX_OSD_PARTS 20 |
14269 | 79 //! Textures for OSD |
13599 | 80 static GLuint osdtex[MAX_OSD_PARTS]; |
13585 | 81 #ifndef FAST_OSD |
14269 | 82 //! Alpha textures for OSD |
13599 | 83 static GLuint osdatex[MAX_OSD_PARTS]; |
13585 | 84 #endif |
35011 | 85 //! Coordinates and texture sizes for OSD |
86 static struct osdcoords { | |
87 int x, y, w, h, sx, sy; | |
88 } osdcoords[MAX_OSD_PARTS]; | |
19578 | 89 static GLuint *eosdtex; |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
90 #define LARGE_EOSD_TEX_SIZE 512 |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
91 #define TINYTEX_SIZE 16 |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
92 #define TINYTEX_COLS (LARGE_EOSD_TEX_SIZE/TINYTEX_SIZE) |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
93 #define TINYTEX_MAX (TINYTEX_COLS*TINYTEX_COLS) |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
94 #define SMALLTEX_SIZE 32 |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
95 #define SMALLTEX_COLS (LARGE_EOSD_TEX_SIZE/SMALLTEX_SIZE) |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
96 #define SMALLTEX_MAX (SMALLTEX_COLS*SMALLTEX_COLS) |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
97 static GLuint largeeosdtex[2]; |
35011 | 98 //! Display list that draws the EOSD parts |
19578 | 99 static GLuint eosdDispList; |
14269 | 100 //! How many parts the OSD currently consists of |
16433 | 101 static int osdtexCnt; |
19578 | 102 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
|
103 static int osd_color; |
1 | 104 |
13601 | 105 static int use_aspect; |
28059
8f43ff543dc6
Add support for YCBCR MESA texture format to vo_gl.
reimar
parents:
28035
diff
changeset
|
106 static int use_ycbcr; |
30029
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
107 #define MASK_ALL_YUV (~(1 << YUV_CONVERSION_NONE)) |
36106 | 108 #define MASK_NOT_COMBINERS (~((1 << YUV_CONVERSION_NONE) | (1 << YUV_CONVERSION_COMBINERS) | (1 << YUV_CONVERSION_COMBINERS_ATI) | (1 << YUV_CONVERSION_TEXT_FRAGMENT))) |
36105
10a63b5e6513
Enable/disable extra instructions for gamma correction
reimar
parents:
35895
diff
changeset
|
109 #define MASK_GAMMA_SUPPORT MASK_NOT_COMBINERS |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
110 static int use_yuv; |
30119
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
111 static int colorspace; |
30293
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
112 static int levelconv; |
30097 | 113 static int is_yuv; |
36111 | 114 static int is_xyz; |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
115 static int lscale; |
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
116 static int cscale; |
26836
ba086caf1230
Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents:
26834
diff
changeset
|
117 static float filter_strength; |
33927 | 118 static float noise_strength; |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
119 static int yuvconvtype; |
16099 | 120 static int use_rectangle; |
35005 | 121 static int using_tex_rect; |
16099 | 122 static int err_shown; |
36171 | 123 static int draw_width, draw_height; |
1 | 124 static uint32_t image_width; |
125 static uint32_t image_height; | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
126 static uint32_t image_format; |
12159 | 127 static int many_fmts; |
26677
e3ae3a37ea8a
Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents:
26624
diff
changeset
|
128 static int ati_hack; |
26681 | 129 static int force_pbo; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
130 static int mesa_buffer; |
16235 | 131 static int use_glFinish; |
16268 | 132 static int swap_interval; |
16099 | 133 static GLenum gl_target; |
16303
a87c6cf3fe52
Fix texture format variable types. Internal format is GLint, others are GLenum
reimar
parents:
16282
diff
changeset
|
134 static GLint gl_texfmt; |
12159 | 135 static GLenum gl_format; |
136 static GLenum gl_type; | |
16434 | 137 static GLuint gl_buffer; |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
138 static GLuint gl_buffer_uv[2]; |
16099 | 139 static int gl_buffersize; |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
140 static int gl_buffersize_uv; |
23987
9ea121c8e2df
Handle case where get_image is called twice without a draw_image in-between
reimar
parents:
23878
diff
changeset
|
141 static void *gl_bufferptr; |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
142 static void *gl_bufferptr_uv[2]; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
143 static int mesa_buffersize; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
144 static void *mesa_bufferptr; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
145 static GLuint fragprog; |
18896
4f6312855a7d
Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents:
18878
diff
changeset
|
146 static GLuint default_texs[22]; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
147 static char *custom_prog; |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
148 static char *custom_tex; |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
149 static int custom_tlin; |
18963 | 150 static int custom_trect; |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
151 static int mipmap_gen; |
31567 | 152 static int stereo_mode; |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
153 static int stipple; |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
154 static enum MPGLType backend; |
1 | 155 |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
156 static int eq_bri = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
157 static int eq_cont = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
158 static int eq_sat = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
159 static int eq_hue = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
160 static int eq_rgamma = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
161 static int eq_ggamma = 0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
162 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
|
163 |
16879
6ea220b10e8e
More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents:
16751
diff
changeset
|
164 static int texture_width; |
6ea220b10e8e
More consistent and sane types. Also avoids some gcc 4 warnings.
reimar
parents:
16751
diff
changeset
|
165 static int texture_height; |
17220 | 166 static int mpi_flipped; |
18996 | 167 static int vo_flipped; |
22149
7b4f17dc2689
Avoid calling aspect on each frame and make ass subtitles work better with panscan
reimar
parents:
22087
diff
changeset
|
168 static int ass_border_x, ass_border_y; |
1 | 169 |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
170 static unsigned int slice_height = 1; |
8654
2c4cebb8637d
- optional slice height for -vo gl (example: -vo gl:32)
arpi
parents:
8148
diff
changeset
|
171 |
34819 | 172 // performance statistics |
173 static int imgcnt, dr_imgcnt, dr_rejectcnt; | |
174 | |
35393
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
175 static int did_render; |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
176 |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
177 static void redraw(void); |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
178 |
36124 | 179 static float video_matrix[16]; |
36171 | 180 static float osd_matrix[16]; |
36124 | 181 |
36156 | 182 static void resize(void) { |
36171 | 183 int i; |
184 draw_width = (vo_rotate & 1) ? vo_dheight : vo_dwidth; | |
185 draw_height = (vo_rotate & 1) ? vo_dwidth : vo_dheight; | |
34337
f8c523d09e5e
Use glLoadMatrixf. This makes it easier to support OpenGL ES.
reimar
parents:
34061
diff
changeset
|
186 // simple orthogonal projection for 0-image_width;0-image_height |
36124 | 187 memset(video_matrix, 0, sizeof(video_matrix)); |
188 video_matrix[0] = 2.0/image_width; | |
189 video_matrix[5] = -2.0/image_height; | |
190 video_matrix[12] = -1; | |
191 video_matrix[13] = 1; | |
192 video_matrix[15] = 1; | |
36171 | 193 memcpy(osd_matrix, video_matrix, sizeof(osd_matrix)); |
194 if (!scaled_osd) { | |
195 // simple orthogonal projection for 0-vo_dwidth;0-vo_dheight | |
196 osd_matrix[0] = 2.0/draw_width; | |
197 osd_matrix[5] = -2.0/draw_height; | |
198 } | |
36156 | 199 mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n", vo_dwidth, vo_dheight); |
15748 | 200 if (WinID >= 0) { |
36156 | 201 int left = 0, top = 0, w = vo_dwidth, h = vo_dheight; |
31534
a12dc8956533
Fix -geometry with -wid behaviour (y position was flipped).
reimar
parents:
31362
diff
changeset
|
202 geometry(&left, &top, &w, &h, vo_dwidth, vo_dheight); |
36156 | 203 top = vo_dheight - h - top; |
31534
a12dc8956533
Fix -geometry with -wid behaviour (y position was flipped).
reimar
parents:
31362
diff
changeset
|
204 mpglViewport(left, top, w, h); |
15748 | 205 } else |
36156 | 206 mpglViewport(0, 0, vo_dwidth, vo_dheight); |
1 | 207 |
36171 | 208 for (i = 0; i < (vo_rotate & 3); i++) { |
209 int j; | |
210 for (j = 0; j < 16; j += 4) { | |
211 ROTATE(float, video_matrix[j], video_matrix[j+1]); | |
212 ROTATE(float, osd_matrix[j], osd_matrix[j+1]); | |
213 } | |
214 } | |
215 | |
28590
d1ca19ff9b52
100l, reset ass_border when switching out of fullscreen mode.
reimar
parents:
28446
diff
changeset
|
216 ass_border_x = ass_border_y = 0; |
29524
b1a437cdc60d
Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
reimar
parents:
29521
diff
changeset
|
217 if (aspect_scaling() && use_aspect) { |
13601 | 218 int new_w, new_h; |
35888
f464ea910bd2
Better compatibility with more restricted GL headers.
reimar
parents:
35830
diff
changeset
|
219 double scale_x, scale_y; |
29524
b1a437cdc60d
Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
reimar
parents:
29521
diff
changeset
|
220 aspect(&new_w, &new_h, A_WINZOOM); |
b1a437cdc60d
Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
reimar
parents:
29521
diff
changeset
|
221 panscan_calc_windowed(); |
13601 | 222 new_w += vo_panscan_x; |
223 new_h += vo_panscan_y; | |
36156 | 224 scale_x = (double)new_w / (double)vo_dwidth; |
225 scale_y = (double)new_h / (double)vo_dheight; | |
36124 | 226 video_matrix[0] *= scale_x; |
36171 | 227 video_matrix[4] *= scale_x; |
36124 | 228 video_matrix[12] *= scale_x; |
36171 | 229 video_matrix[1] *= scale_y; |
36124 | 230 video_matrix[5] *= scale_y; |
231 video_matrix[13] *= scale_y; | |
36171 | 232 if (vo_rotate & 1) { |
233 int tmp = new_w; new_w = new_h; new_h = tmp; | |
234 } | |
235 ass_border_x = (draw_width - new_w) / 2; | |
236 ass_border_y = (draw_height - new_h) / 2; | |
13601 | 237 } |
36124 | 238 mpglLoadMatrixf(video_matrix); |
1 | 239 |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
240 if (!scaled_osd) { |
27393 | 241 #ifdef CONFIG_FREETYPE |
31573 | 242 // adjust font size to display size |
243 force_load_font = 1; | |
15086
c9eee448e5b2
revert the previous commit, gl needs to reload the font immediately
henry
parents:
15080
diff
changeset
|
244 #endif |
31573 | 245 vo_osd_changed(OSDTYPE_OSD); |
13660
b34c5aa5f798
OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents:
13653
diff
changeset
|
246 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
247 mpglClear(GL_COLOR_BUFFER_BIT); |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
248 redraw(); |
1 | 249 } |
250 | |
16099 | 251 static void texSize(int w, int h, int *texw, int *texh) { |
252 if (use_rectangle) { | |
253 *texw = w; *texh = h; | |
254 } else { | |
255 *texw = 32; | |
256 while (*texw < w) | |
257 *texw *= 2; | |
258 *texh = 32; | |
259 while (*texh < h) | |
260 *texh *= 2; | |
261 } | |
28073 | 262 if (mesa_buffer) *texw = (*texw + 63) & ~63; |
28074
24871084fad6
ati_hack only makes sense when PBOs are used, not with mesa_buffer.
reimar
parents:
28073
diff
changeset
|
263 else if (ati_hack) *texw = (*texw + 511) & ~511; |
16099 | 264 } |
265 | |
16595
b3a9fb41f475
fix/improve code doxumentation. Also group gl_common functions in several
reimar
parents:
16593
diff
changeset
|
266 //! maximum size of custom fragment program |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
267 #define MAX_CUSTOM_PROG_SIZE (1024 * 1024) |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
268 static void update_yuvconv(void) { |
33414 | 269 int xs, ys, depth; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
270 float bri = eq_bri / 100.0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
271 float cont = (eq_cont + 100) / 100.0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
272 float hue = eq_hue / 100.0 * 3.1415927; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
273 float sat = (eq_sat + 100) / 100.0; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
274 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
|
275 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
|
276 float bgamma = exp(log(8.0) * eq_bgamma / 100.0); |
26834
aadfce1c25c8
Use a struct instead of a huge and further growing argument list.
reimar
parents:
26823
diff
changeset
|
277 gl_conversion_params_t params = {gl_target, yuvconvtype, |
33414 | 278 {colorspace, levelconv, bri, cont, hue, sat, rgamma, ggamma, bgamma, 0}, |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
279 texture_width, texture_height, 0, 0, filter_strength, noise_strength, |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
280 stereo_mode == GL_3D_STIPPLE}; |
33414 | 281 mp_get_chroma_shift(image_format, &xs, &ys, &depth); |
30097 | 282 params.chrom_texw = params.texw >> xs; |
283 params.chrom_texh = params.texh >> ys; | |
33414 | 284 params.csp_params.input_shift = -depth & 7; |
36111 | 285 params.is_planar = is_yuv; |
286 if (is_xyz) { | |
287 params.csp_params.format = MP_CSP_XYZ; | |
288 params.csp_params.input_shift = 0; | |
289 params.csp_params.rgamma *= 2.2; | |
290 params.csp_params.ggamma *= 2.2; | |
291 params.csp_params.bgamma *= 2.2; | |
292 } | |
26834
aadfce1c25c8
Use a struct instead of a huge and further growing argument list.
reimar
parents:
26823
diff
changeset
|
293 glSetupYUVConversion(¶ms); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
294 if (custom_prog) { |
30994
38a0aa0ac675
Open cutomtex file in binary mode to avoid potential issues on
reimar
parents:
30964
diff
changeset
|
295 FILE *f = fopen(custom_prog, "rb"); |
31573 | 296 if (!f) { |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
297 mp_msg(MSGT_VO, MSGL_WARN, |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
298 "[gl] Could not read customprog %s\n", custom_prog); |
31573 | 299 } else { |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
300 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
|
301 fread(prog, 1, MAX_CUSTOM_PROG_SIZE, f); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
302 fclose(f); |
18653
5af43a16abc3
loadGPUProgram function to load fragment program with error checking and statistics
reimar
parents:
18619
diff
changeset
|
303 loadGPUProgram(GL_FRAGMENT_PROGRAM, prog); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
304 free(prog); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
305 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
306 mpglProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 0, |
18960 | 307 1.0 / texture_width, 1.0 / texture_height, |
308 texture_width, texture_height); | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
309 } |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
310 if (custom_tex) { |
31064
7d174bdfcd9a
100l, open the customtex also in binary mode, not just the program.
reimar
parents:
31044
diff
changeset
|
311 FILE *f = fopen(custom_tex, "rb"); |
31573 | 312 if (!f) { |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
313 mp_msg(MSGT_VO, MSGL_WARN, |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
314 "[gl] Could not read customtex %s\n", custom_tex); |
31573 | 315 } else { |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
316 int width, height, maxval; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
317 mpglActiveTexture(GL_TEXTURE3); |
18963 | 318 if (glCreatePPMTex(custom_trect?GL_TEXTURE_RECTANGLE:GL_TEXTURE_2D, 0, |
31573 | 319 custom_tlin?GL_LINEAR:GL_NEAREST, |
320 f, &width, &height, &maxval)) { | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
321 mpglProgramEnvParameter4f(GL_FRAGMENT_PROGRAM, 1, |
18960 | 322 1.0 / width, 1.0 / height, width, height); |
31573 | 323 } else |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
324 mp_msg(MSGT_VO, MSGL_WARN, |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
325 "[gl] Error parsing customtex %s\n", custom_tex); |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
326 fclose(f); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
327 mpglActiveTexture(GL_TEXTURE0); |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
328 } |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
329 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
330 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
331 |
16436 | 332 /** |
333 * \brief remove all OSD textures and display-lists, thus clearing it. | |
334 */ | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
335 static void clearOSD(void) { |
17871
29cce29b0cd9
do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents:
17566
diff
changeset
|
336 if (!osdtexCnt) |
29cce29b0cd9
do not call glDeleteTextures with 0 count, Xgl does not like it.
reimar
parents:
17566
diff
changeset
|
337 return; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
338 mpglDeleteTextures(osdtexCnt, osdtex); |
16433 | 339 #ifndef FAST_OSD |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
340 mpglDeleteTextures(osdtexCnt, osdatex); |
16433 | 341 #endif |
342 osdtexCnt = 0; | |
343 } | |
344 | |
345 /** | |
19578 | 346 * \brief remove textures, display list and free memory used by EOSD |
347 */ | |
348 static void clearEOSD(void) { | |
19934 | 349 if (eosdDispList) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
350 mpglDeleteLists(eosdDispList, 1); |
19934 | 351 eosdDispList = 0; |
352 if (eosdtexCnt) | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
353 mpglDeleteTextures(eosdtexCnt, eosdtex); |
19934 | 354 eosdtexCnt = 0; |
19578 | 355 free(eosdtex); |
356 eosdtex = NULL; | |
357 } | |
358 | |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
359 static inline int is_tinytex(struct mp_eosd_image *i, int tinytexcur) { |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
360 return i->w < TINYTEX_SIZE && i->h < TINYTEX_SIZE && tinytexcur < TINYTEX_MAX; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
361 } |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
362 |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
363 static inline int is_smalltex(struct mp_eosd_image *i, int smalltexcur) { |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
364 return i->w < SMALLTEX_SIZE && i->h < SMALLTEX_SIZE && smalltexcur < SMALLTEX_MAX; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
365 } |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
366 |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
367 static inline void tinytex_pos(int tinytexcur, int *x, int *y) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
368 *x = (tinytexcur % TINYTEX_COLS) * TINYTEX_SIZE; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
369 *y = (tinytexcur / TINYTEX_COLS) * TINYTEX_SIZE; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
370 } |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
371 |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
372 static inline void smalltex_pos(int smalltexcur, int *x, int *y) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
373 *x = (smalltexcur % SMALLTEX_COLS) * SMALLTEX_SIZE; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
374 *y = (smalltexcur / SMALLTEX_COLS) * SMALLTEX_SIZE; |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
375 } |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
376 |
19578 | 377 /** |
378 * \brief construct display list from ass image list | |
379 * \param img image list to create OSD from. | |
380 * A value of NULL has the same effect as clearEOSD() | |
381 */ | |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
382 static void genEOSD(struct mp_eosd_image_list *imgs) { |
19578 | 383 int sx, sy; |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
384 int tinytexcur = 0; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
385 int smalltexcur = 0; |
19578 | 386 GLuint *curtex; |
28035 | 387 GLint scale_type = scaled_osd ? GL_LINEAR : GL_NEAREST; |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
388 struct mp_eosd_image *img = eosd_image_first(imgs); |
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
389 struct mp_eosd_image *i; |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
390 |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
391 if (imgs->changed == 0) // there are elements, but they are unchanged |
28808
49aaf6f7052b
Simplify EOSD code by rendering it in VOCTRL_DRAW_EOSD instead of genEOSD,
reimar
parents:
28803
diff
changeset
|
392 return; |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
393 if (img && imgs->changed == 1) // there are elements, but they just moved |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
394 goto skip_upload; |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
395 |
19578 | 396 clearEOSD(); |
19935
698b1d68ac83
Make genEOSD behaviour with NULL data more explicit
reimar
parents:
19934
diff
changeset
|
397 if (!img) |
698b1d68ac83
Make genEOSD behaviour with NULL data more explicit
reimar
parents:
19934
diff
changeset
|
398 return; |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
399 if (!largeeosdtex[0]) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
400 mpglGenTextures(2, largeeosdtex); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
401 mpglBindTexture(gl_target, largeeosdtex[0]); |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
402 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, LARGE_EOSD_TEX_SIZE, LARGE_EOSD_TEX_SIZE, 0); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
403 mpglBindTexture(gl_target, largeeosdtex[1]); |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
404 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, LARGE_EOSD_TEX_SIZE, LARGE_EOSD_TEX_SIZE, 0); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
405 } |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
406 for (i = img; i; i = eosd_image_next(imgs)) |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
407 { |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
408 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
|
409 continue; |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
410 if (is_tinytex(i, tinytexcur)) |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
411 tinytexcur++; |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
412 else if (is_smalltex(i, smalltexcur)) |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
413 smalltexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
414 else |
19939 | 415 eosdtexCnt++; |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
416 } |
20084 | 417 mp_msg(MSGT_VO, MSGL_DBG2, "EOSD counts (tiny, small, all): %i, %i, %i\n", |
418 tinytexcur, smalltexcur, eosdtexCnt); | |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
419 if (eosdtexCnt) { |
19939 | 420 eosdtex = calloc(eosdtexCnt, sizeof(GLuint)); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
421 mpglGenTextures(eosdtexCnt, eosdtex); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
422 } |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
423 tinytexcur = smalltexcur = 0; |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
424 for (i = eosd_image_first(imgs), curtex = eosdtex; i; i = eosd_image_next(imgs)) { |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
425 int x = 0, y = 0; |
19578 | 426 if (i->w <= 0 || i->h <= 0 || i->stride < i->w) { |
427 mp_msg(MSGT_VO, MSGL_V, "Invalid dimensions OSD for part!\n"); | |
428 continue; | |
429 } | |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
430 if (is_tinytex(i, tinytexcur)) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
431 tinytex_pos(tinytexcur, &x, &y); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
432 mpglBindTexture(gl_target, largeeosdtex[0]); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
433 tinytexcur++; |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
434 } else if (is_smalltex(i, smalltexcur)) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
435 smalltex_pos(smalltexcur, &x, &y); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
436 mpglBindTexture(gl_target, largeeosdtex[1]); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
437 smalltexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
438 } else { |
19939 | 439 texSize(i->w, i->h, &sx, &sy); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
440 mpglBindTexture(gl_target, *curtex++); |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
441 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
442 } |
19578 | 443 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
|
444 x, y, i->w, i->h, 0); |
19578 | 445 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
446 eosdDispList = mpglGenLists(1); |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
447 skip_upload: |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
448 mpglNewList(eosdDispList, GL_COMPILE); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
449 tinytexcur = smalltexcur = 0; |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
450 for (i = eosd_image_first(imgs), curtex = eosdtex; i; i = eosd_image_next(imgs)) { |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
451 int x = 0, y = 0; |
19578 | 452 if (i->w <= 0 || i->h <= 0 || i->stride < i->w) |
453 continue; | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
454 mpglColor4ub(i->color >> 24, (i->color >> 16) & 0xff, (i->color >> 8) & 0xff, 255 - (i->color & 0xff)); |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
455 if (is_tinytex(i, tinytexcur)) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
456 tinytex_pos(tinytexcur, &x, &y); |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
457 sx = sy = LARGE_EOSD_TEX_SIZE; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
458 mpglBindTexture(gl_target, largeeosdtex[0]); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
459 tinytexcur++; |
28814
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
460 } else if (is_smalltex(i, smalltexcur)) { |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
461 smalltex_pos(smalltexcur, &x, &y); |
aa16560de0e7
Refactor smalltex/tinytex EOSD optimization in vo_gl
reimar
parents:
28808
diff
changeset
|
462 sx = sy = LARGE_EOSD_TEX_SIZE; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
463 mpglBindTexture(gl_target, largeeosdtex[1]); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
464 smalltexcur++; |
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
465 } else { |
19939 | 466 texSize(i->w, i->h, &sx, &sy); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
467 mpglBindTexture(gl_target, *curtex++); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
468 } |
35005 | 469 glDrawTex(i->dst_x, i->dst_y, i->w, i->h, x, y, i->w, i->h, sx, sy, using_tex_rect, 0, 0, 0); |
19578 | 470 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
471 mpglEndList(); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
472 mpglBindTexture(gl_target, 0); |
19578 | 473 } |
474 | |
475 /** | |
16433 | 476 * \brief uninitialize OpenGL context, freeing textures, buffers etc. |
477 */ | |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17220
diff
changeset
|
478 static void uninitGl(void) { |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
479 int i = 0; |
34819 | 480 mp_msg(MSGT_VO, MSGL_V, "Drawn %i frames, %i using DR, DR refused %i\n", |
481 imgcnt, dr_imgcnt, dr_rejectcnt); | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
482 if (mpglDeletePrograms && fragprog) |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
483 mpglDeletePrograms(1, &fragprog); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
484 fragprog = 0; |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
485 while (default_texs[i] != 0) |
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
486 i++; |
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
487 if (i) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
488 mpglDeleteTextures(i, default_texs); |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
489 default_texs[0] = 0; |
16433 | 490 clearOSD(); |
19578 | 491 clearEOSD(); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
492 if (largeeosdtex[0]) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
493 mpglDeleteTextures(2, largeeosdtex); |
19938
f862045246a9
Aggregate multiple small EOSD textures into one large since hundreds of
reimar
parents:
19937
diff
changeset
|
494 largeeosdtex[0] = 0; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
495 if (mpglDeleteBuffers && gl_buffer) |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
496 mpglDeleteBuffers(1, &gl_buffer); |
16433 | 497 gl_buffer = 0; gl_buffersize = 0; |
23987
9ea121c8e2df
Handle case where get_image is called twice without a draw_image in-between
reimar
parents:
23878
diff
changeset
|
498 gl_bufferptr = NULL; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
499 if (mpglDeleteBuffers && gl_buffer_uv[0]) |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
500 mpglDeleteBuffers(2, gl_buffer_uv); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
501 gl_buffer_uv[0] = gl_buffer_uv[1] = 0; gl_buffersize_uv = 0; |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
502 gl_bufferptr_uv[0] = gl_bufferptr_uv[1] = 0; |
30023 | 503 #ifdef CONFIG_GL_X11 |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
504 if (mesa_bufferptr) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
505 mpglFreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); |
29648
74f94f407c31
Re-add some ifdefs, partially reverting r29688, since mDisplay and
reimar
parents:
29646
diff
changeset
|
506 #endif |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
507 mesa_bufferptr = NULL; |
16433 | 508 err_shown = 0; |
509 } | |
510 | |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
511 static int isSoftwareGl(void) |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
512 { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
513 const char *renderer = mpglGetString(GL_RENDERER); |
32632
d9764e977f12
llvmpipe, while only slow instead of insanely slow, is a software renderer.
reimar
parents:
32537
diff
changeset
|
514 return !renderer || strcmp(renderer, "Software Rasterizer") == 0 || |
d9764e977f12
llvmpipe, while only slow instead of insanely slow, is a software renderer.
reimar
parents:
32537
diff
changeset
|
515 strstr(renderer, "llvmpipe"); |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
516 } |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
517 |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
518 static void autodetectGlExtensions(void) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
519 const char *extensions = mpglGetString(GL_EXTENSIONS); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
520 const char *vendor = mpglGetString(GL_VENDOR); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
521 const char *version = mpglGetString(GL_VERSION); |
31070
52eb10f9e51e
Also print OpenGL renderer string with vendor and version with -v
reimar
parents:
31064
diff
changeset
|
522 const char *renderer = mpglGetString(GL_RENDERER); |
31022 | 523 int is_ati = vendor && strstr(vendor, "ATI") != NULL; |
28423
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
524 int ati_broken_pbo = 0; |
31070
52eb10f9e51e
Also print OpenGL renderer string with vendor and version with -v
reimar
parents:
31064
diff
changeset
|
525 mp_msg(MSGT_VO, MSGL_V, "[gl] Running on OpenGL '%s' by '%s', version '%s'\n", renderer, vendor, version); |
28423
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
526 if (is_ati && strncmp(version, "2.1.", 4) == 0) { |
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
527 int ver = atoi(version + 4); |
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
528 mp_msg(MSGT_VO, MSGL_V, "[gl] Detected ATI driver version: %i\n", ver); |
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
529 ati_broken_pbo = ver && ver < 8395; |
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
530 } |
395034c15a4b
Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
reimar
parents:
28255
diff
changeset
|
531 if (ati_hack == -1) ati_hack = ati_broken_pbo; |
31150
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
532 if (force_pbo == -1) { |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
533 force_pbo = 0; |
34818 | 534 // memcpy is just too slow at least on PPC. |
535 if (ARCH_X86 && extensions && strstr(extensions, "_pixel_buffer_object")) | |
31150
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
536 force_pbo = is_ati; |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
537 } |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
538 if (use_rectangle == -1) { |
31093 | 539 use_rectangle = 0; |
31150
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
540 if (extensions) { |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
541 // if (strstr(extensions, "_texture_non_power_of_two")) |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
542 if (strstr(extensions, "_texture_rectangle")) |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
543 use_rectangle = renderer && strstr(renderer, "Mesa DRI R200") ? 1 : 0; |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
544 } |
7886a9ada88e
Fix OpenGL autodetection to not leave values at -1.
reimar
parents:
31094
diff
changeset
|
545 } |
31023
769929c96d44
Disable OSD support by default if the necessary OpenGL functionality is missing.
reimar
parents:
31022
diff
changeset
|
546 if (use_osd == -1) |
769929c96d44
Disable OSD support by default if the necessary OpenGL functionality is missing.
reimar
parents:
31022
diff
changeset
|
547 use_osd = mpglBindTexture != NULL; |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
548 if (use_yuv == -1) { |
30964
a5c6b37b3af6
Factor out the YUV->RGB conversion auto-selection and also
reimar
parents:
30945
diff
changeset
|
549 use_yuv = glAutodetectYUVConversion(); |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
550 if (stereo_mode == GL_3D_STIPPLE && |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
551 !glYUVSupportsAlphaTex(use_yuv)) |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
552 use_yuv = 0; |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
553 } |
35008 | 554 if (use_ycbcr == -1) |
555 use_ycbcr = extensions && strstr(extensions, "ycbcr_422"); | |
28153
1c34bd14e6b6
Warn when using features that are broken due to ATI driver bugs.
reimar
parents:
28152
diff
changeset
|
556 if (is_ati && (lscale == 1 || lscale == 2 || cscale == 1 || cscale == 2)) |
28424 | 557 mp_msg(MSGT_VO, MSGL_WARN, "[gl] Selected scaling mode may be broken on ATI cards.\n" |
28153
1c34bd14e6b6
Warn when using features that are broken due to ATI driver bugs.
reimar
parents:
28152
diff
changeset
|
558 "Tell _them_ to fix GL_REPEAT if you have issues.\n"); |
35008 | 559 mp_msg(MSGT_VO, MSGL_V, "[gl] Settings after autodetection: ati-hack = %i, force-pbo = %i, rectangle = %i, yuv = %i, ycbcr = %i\n", |
560 ati_hack, force_pbo, use_rectangle, use_yuv, use_ycbcr); | |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
561 } |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
562 |
31677 | 563 static GLint get_scale_type(int chroma) { |
564 int nearest = (chroma ? cscale : lscale) & 64; | |
565 if (nearest) | |
566 return mipmap_gen ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST; | |
567 return mipmap_gen ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR; | |
568 } | |
569 | |
13843 | 570 /** |
571 * \brief Initialize a (new or reused) OpenGL context. | |
16433 | 572 * set global gl-related variables to their default values |
13843 | 573 */ |
36156 | 574 static int initGl(void) { |
31677 | 575 GLint scale_type = get_scale_type(0); |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
576 autodetectGlExtensions(); |
35005 | 577 using_tex_rect = gl_format == GL_YCBCR_422_APPLE || use_rectangle == 1; |
578 gl_target = using_tex_rect ? GL_TEXTURE_RECTANGLE : GL_TEXTURE_2D; | |
31676
a0a48c62bb8c
Helper macros to build the yuv conversion type number.
reimar
parents:
31674
diff
changeset
|
579 yuvconvtype = SET_YUV_CONVERSION(use_yuv) | |
a0a48c62bb8c
Helper macros to build the yuv conversion type number.
reimar
parents:
31674
diff
changeset
|
580 SET_YUV_LUM_SCALER(lscale) | |
a0a48c62bb8c
Helper macros to build the yuv conversion type number.
reimar
parents:
31674
diff
changeset
|
581 SET_YUV_CHROM_SCALER(cscale); |
30446
f77e32f1ecc0
Avoid using options before autodetectGlExtensions to allow it to change them properly.
reimar
parents:
30445
diff
changeset
|
582 |
16099 | 583 texSize(image_width, image_height, &texture_width, &texture_height); |
13843 | 584 |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
585 mpglDisable(GL_BLEND); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
586 mpglDisable(GL_DEPTH_TEST); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
587 mpglDepthMask(GL_FALSE); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
588 mpglDisable(GL_CULL_FACE); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
589 mpglEnable(gl_target); |
34338 | 590 if (mpglDrawBuffer) |
591 mpglDrawBuffer(vo_doublebuffering?GL_BACK:GL_FRONT); | |
34839
5e29e950d918
Do not needlessly modulate the texture color with the vertex color.
reimar
parents:
34819
diff
changeset
|
592 mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); |
13843 | 593 |
594 mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n", | |
595 texture_width, texture_height); | |
596 | |
31674
4996a06d9844
Cosmetics: create luma texture first, then the other textures.
reimar
parents:
31581
diff
changeset
|
597 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, scale_type, |
4996a06d9844
Cosmetics: create luma texture first, then the other textures.
reimar
parents:
31581
diff
changeset
|
598 texture_width, texture_height, 0); |
4996a06d9844
Cosmetics: create luma texture first, then the other textures.
reimar
parents:
31581
diff
changeset
|
599 if (mipmap_gen) |
4996a06d9844
Cosmetics: create luma texture first, then the other textures.
reimar
parents:
31581
diff
changeset
|
600 mpglTexParameteri(gl_target, GL_GENERATE_MIPMAP, GL_TRUE); |
4996a06d9844
Cosmetics: create luma texture first, then the other textures.
reimar
parents:
31581
diff
changeset
|
601 |
36111 | 602 if (is_yuv || is_xyz || custom_prog || stereo_mode == GL_3D_STIPPLE) { |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
603 int i; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
604 mpglGenTextures(21, default_texs); |
18896
4f6312855a7d
Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT,
reimar
parents:
18878
diff
changeset
|
605 default_texs[21] = 0; |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
606 for (i = 0; i < 7; i++) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
607 mpglActiveTexture(GL_TEXTURE1 + i); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
608 mpglBindTexture(GL_TEXTURE_2D, default_texs[i]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
609 mpglBindTexture(GL_TEXTURE_RECTANGLE, default_texs[i + 7]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
610 mpglBindTexture(GL_TEXTURE_3D, default_texs[i + 14]); |
18871
32743cc5f380
Make sure all texture units have a different texture bound.
reimar
parents:
18788
diff
changeset
|
611 } |
36113 | 612 mpglActiveTexture(GL_TEXTURE0); |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
613 } |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
614 if (stereo_mode == GL_3D_STIPPLE) |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
615 glSetupAlphaStippleTex(stipple); |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
616 if (is_yuv) { |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
617 int xs, ys, depth; |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
618 int chroma_clear_val = 128; |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
619 scale_type = get_scale_type(1); |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
620 mp_get_chroma_shift(image_format, &xs, &ys, &depth); |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
621 chroma_clear_val >>= -depth & 7; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
622 mpglActiveTexture(GL_TEXTURE1); |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
623 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, scale_type, |
33416
b7b169f5abda
Fix clear/border color of chroma texture for 9- and 10-bit formats.
reimar
parents:
33414
diff
changeset
|
624 texture_width >> xs, texture_height >> ys, |
b7b169f5abda
Fix clear/border color of chroma texture for 9- and 10-bit formats.
reimar
parents:
33414
diff
changeset
|
625 chroma_clear_val); |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
626 if (mipmap_gen) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
627 mpglTexParameteri(gl_target, GL_GENERATE_MIPMAP, GL_TRUE); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
628 mpglActiveTexture(GL_TEXTURE2); |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
629 glCreateClearTex(gl_target, gl_texfmt, gl_format, gl_type, scale_type, |
33416
b7b169f5abda
Fix clear/border color of chroma texture for 9- and 10-bit formats.
reimar
parents:
33414
diff
changeset
|
630 texture_width >> xs, texture_height >> ys, |
b7b169f5abda
Fix clear/border color of chroma texture for 9- and 10-bit formats.
reimar
parents:
33414
diff
changeset
|
631 chroma_clear_val); |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
632 if (mipmap_gen) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
633 mpglTexParameteri(gl_target, GL_GENERATE_MIPMAP, GL_TRUE); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
634 mpglActiveTexture(GL_TEXTURE0); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
635 mpglBindTexture(gl_target, 0); |
30029
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
636 } |
36111 | 637 if (is_yuv || is_xyz || custom_prog) |
30029
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
638 { |
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
639 if ((MASK_NOT_COMBINERS & (1 << use_yuv)) || custom_prog) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
640 if (!mpglGenPrograms || !mpglBindProgram) { |
30029
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
641 mp_msg(MSGT_VO, MSGL_ERR, "[gl] fragment program functions missing!\n"); |
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
642 } else { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
643 mpglGenPrograms(1, &fragprog); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
644 mpglBindProgram(GL_FRAGMENT_PROGRAM, fragprog); |
30029
0cc0965bc4c3
Make -vo gl:customprog also work with RGB input (obviously those need to be
reimar
parents:
30023
diff
changeset
|
645 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
646 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
647 update_yuvconv(); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
648 } |
13843 | 649 |
36156 | 650 resize(); |
13843 | 651 |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
652 mpglClearColor( 0.0f,0.0f,0.0f,0.0f ); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
653 mpglClear( GL_COLOR_BUFFER_BIT ); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
654 if (mpglSwapInterval && swap_interval >= 0) |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
655 mpglSwapInterval(swap_interval); |
13920 | 656 return 1; |
13843 | 657 } |
658 | |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
659 static int create_window(uint32_t d_width, uint32_t d_height, uint32_t flags, const char *title) |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
660 { |
32533
c41773445d3b
gl/win32: select a stereo pixel format for window when
reimar
parents:
32467
diff
changeset
|
661 if (stereo_mode == GL_3D_QUADBUFFER) |
c41773445d3b
gl/win32: select a stereo pixel format for window when
reimar
parents:
32467
diff
changeset
|
662 flags |= VOFLAG_STEREO; |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
663 #ifdef CONFIG_GL_WIN32 |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
664 if (glctx.type == GLTYPE_W32 && !vo_w32_config(d_width, d_height, flags)) |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
665 return -1; |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
666 #endif |
35089
a87c434ecaa3
Allow compiling -vo gl with OSX backend even if X11 and SDL are not available.
reimar
parents:
35087
diff
changeset
|
667 #ifdef CONFIG_GL_OSX |
35087 | 668 if (glctx.type == GLTYPE_OSX && !vo_osx_config(d_width, d_height, flags)) |
669 return -1; | |
670 #endif | |
34338 | 671 #ifdef CONFIG_GL_EGL_X11 |
672 if (glctx.type == GLTYPE_EGL_X11) { | |
673 XVisualInfo vinfo = { .visual = CopyFromParent, .depth = CopyFromParent }; | |
674 vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, d_width, d_height, flags, | |
675 CopyFromParent, "gl", title); | |
676 } | |
677 #endif | |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
678 #ifdef CONFIG_GL_X11 |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
679 if (glctx.type == GLTYPE_X11) { |
31573 | 680 static int default_glx_attribs[] = { |
681 GLX_RGBA, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, | |
682 GLX_DOUBLEBUFFER, None | |
683 }; | |
31572
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
684 static int stereo_glx_attribs[] = { |
31573 | 685 GLX_RGBA, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, |
31572
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
686 GLX_DOUBLEBUFFER, GLX_STEREO, None |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
687 }; |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
688 XVisualInfo *vinfo = NULL; |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
689 if (stereo_mode == GL_3D_QUADBUFFER) { |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
690 vinfo = glXChooseVisual(mDisplay, mScreen, stereo_glx_attribs); |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
691 if (!vinfo) |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
692 mp_msg(MSGT_VO, MSGL_ERR, "[gl] Could not find a stereo visual, " |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
693 "3D will probably not work!\n"); |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
694 } |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
695 if (!vinfo) |
69bfe6277214
Try to get a quadbuffered visual if the corresponding 3D mode was selected.
reimar
parents:
31571
diff
changeset
|
696 vinfo = glXChooseVisual(mDisplay, mScreen, default_glx_attribs); |
31573 | 697 if (!vinfo) { |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
698 mp_msg(MSGT_VO, MSGL_ERR, "[gl] no GLX support present\n"); |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
699 return -1; |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
700 } |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
701 mp_msg(MSGT_VO, MSGL_V, "[gl] GLX chose visual with ID 0x%x\n", (int)vinfo->visualid); |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
702 |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
703 vo_x11_create_vo_window(vinfo, vo_dx, vo_dy, d_width, d_height, flags, |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
704 XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone), |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
705 "gl", title); |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
706 } |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
707 #endif |
31022 | 708 #ifdef CONFIG_GL_SDL |
709 if (glctx.type == GLTYPE_SDL) { | |
34845 | 710 // Ugly to do this here, but SDL ignores it if set later |
34874 | 711 if (swap_interval >= 0) { |
712 #if SDL_VERSION_ATLEAST(1, 3, 0) | |
713 SDL_GL_SetSwapInterval(swap_interval); | |
714 #elif SDL_VERSION_ATLEAST(1, 2, 10) | |
715 SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, swap_interval); | |
34845 | 716 #endif |
34874 | 717 } |
34812 | 718 if (!vo_sdl_config(d_width, d_height, flags, title)) |
719 return -1; | |
31022 | 720 } |
721 #endif | |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
722 return 0; |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
723 } |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
724 |
35092 | 725 #ifdef CONFIG_GL_OSX |
726 static void osx_redraw(void) | |
727 { | |
35095
dfa2e1b78664
Remove duplicate redraw call, resize already calls it.
reimar
parents:
35093
diff
changeset
|
728 // resize will call redraw to refresh the screen |
36156 | 729 resize(); |
35092 | 730 } |
731 #endif | |
732 | |
1 | 733 /* connect to server, create and map window, |
734 * allocate colors and (shared) memory | |
735 */ | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28939
diff
changeset
|
736 static int |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
7111
diff
changeset
|
737 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) |
1 | 738 { |
30097 | 739 int xs, ys; |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
740 image_height = height; |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
741 image_width = width; |
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
742 image_format = format; |
33365
706871635af7
Make mp_get_chroma_shift simpler/more generic and add an argument
reimar
parents:
33305
diff
changeset
|
743 is_yuv = mp_get_chroma_shift(image_format, &xs, &ys, NULL) > 0; |
30097 | 744 is_yuv |= (xs << 8) | (ys << 16); |
36111 | 745 is_xyz = IMGFMT_IS_XYZ(image_format); |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
746 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
|
747 |
35895
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
748 if (glctx.type == GLTYPE_OSX && vo_doublebuffering && !is_yuv) { |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
749 // doublebuffering causes issues when e.g. drawing yuy2 or rgb textures |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
750 // (nothing is draw) unless using glfinish which makes things slow. |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
751 // This is possibly because we do not actually request a double-buffered |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
752 // context. |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
753 // However single-buffering causes slowdown and artefacts when |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
754 // drawing planar formats. Mostly tested on PPC MacMini |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
755 mp_msg(MSGT_VO, MSGL_INFO, "[gl] -double not supported on OSX for interleaved formats, switching to -nodouble\n"); |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
756 vo_doublebuffering = 0; |
b4047109a8bd
Try to fix performance for -vo gl on OSX with planar YUV.
reimar
parents:
35889
diff
changeset
|
757 } |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
758 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
|
759 |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
760 if (create_window(d_width, d_height, flags, title) < 0) |
16109
519a307e3ccf
OpenGL fixes for windows and vo_gl.c ported to windows.
reimar
parents:
16099
diff
changeset
|
761 return -1; |
15748 | 762 |
16433 | 763 if (vo_config_count) |
764 uninitGl(); | |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
765 if (glctx.setGlWindow(&glctx) == SET_WINDOW_FAILED) |
29570
eb2567b65311
Check setGlWindow return value to fail properly instead of crashing if e.g.
reimar
parents:
29524
diff
changeset
|
766 return -1; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
767 if (mesa_buffer && !mpglAllocateMemoryMESA) { |
29680
57ed11e0d3ce
Print error instead of crashing when mesa-buffer is used on systems
reimar
parents:
29648
diff
changeset
|
768 mp_msg(MSGT_VO, MSGL_ERR, "Can not enable mesa-buffer because AllocateMemoryMESA was not found\n"); |
57ed11e0d3ce
Print error instead of crashing when mesa-buffer is used on systems
reimar
parents:
29648
diff
changeset
|
769 mesa_buffer = 0; |
57ed11e0d3ce
Print error instead of crashing when mesa-buffer is used on systems
reimar
parents:
29648
diff
changeset
|
770 } |
36156 | 771 initGl(); |
11542 | 772 |
35092 | 773 #ifdef CONFIG_GL_OSX |
774 vo_osx_redraw_func = osx_redraw; | |
775 #endif | |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
776 return 0; |
1 | 777 } |
778 | |
31 | 779 static void check_events(void) |
1 | 780 { |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
781 int e=glctx.check_events(); |
31043
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31036
diff
changeset
|
782 if(e&VO_EVENT_REINIT) { |
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31036
diff
changeset
|
783 uninitGl(); |
36156 | 784 initGl(); |
31043
80036ef586ff
Add reinitialization support. Necessary for fullscreen on OSX.
reimar
parents:
31036
diff
changeset
|
785 } |
36156 | 786 if(e&VO_EVENT_RESIZE) resize(); |
35382
b85d632c3fe1
vo_gl: react to expose events even when not paused.
reimar
parents:
35097
diff
changeset
|
787 else if(e&VO_EVENT_EXPOSE) redraw(); |
31 | 788 } |
1 | 789 |
13585 | 790 /** |
791 * Creates the textures and the display list needed for displaying | |
792 * an OSD part. | |
793 * Callback function for vo_draw_text(). | |
794 */ | |
795 static void create_osd_texture(int x0, int y0, int w, int h, | |
796 unsigned char *src, unsigned char *srca, | |
797 int stride) | |
798 { | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
799 // 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
|
800 int sx = 8, sy = 8; |
28035 | 801 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
|
802 |
3bf109509189
extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents:
17871
diff
changeset
|
803 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
|
804 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
|
805 return; |
3bf109509189
extra checks on size of OSD parts (though IMHO these values should never be bad)
reimar
parents:
17871
diff
changeset
|
806 } |
16099 | 807 texSize(w, h, &sx, &sy); |
13585 | 808 |
809 if (osdtexCnt >= MAX_OSD_PARTS) { | |
810 mp_msg(MSGT_VO, MSGL_ERR, "Too many OSD parts, contact the developers!\n"); | |
811 return; | |
812 } | |
813 | |
814 // create Textures for OSD part | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
815 mpglGenTextures(1, &osdtex[osdtexCnt]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
816 mpglBindTexture(gl_target, osdtex[osdtexCnt]); |
27621
53b5cf466361
Change glCreateClearTex to use the same host data format as later uploads.
reimar
parents:
27393
diff
changeset
|
817 glCreateClearTex(gl_target, GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0); |
16117 | 818 glUploadTex(gl_target, GL_LUMINANCE, GL_UNSIGNED_BYTE, src, stride, |
819 0, 0, w, h, 0); | |
13585 | 820 |
821 #ifndef FAST_OSD | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
822 mpglGenTextures(1, &osdatex[osdtexCnt]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
823 mpglBindTexture(gl_target, osdatex[osdtexCnt]); |
28002
bcb567424fbc
100l, OSD alpha textures were cleared to the wrong value.
reimar
parents:
27987
diff
changeset
|
824 glCreateClearTex(gl_target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, scale_type, sx, sy, 0); |
16117 | 825 { |
16221 | 826 int i; |
18878 | 827 char *tmp = malloc(stride * h); |
16272 | 828 // convert alpha from weird MPlayer scale. |
829 // 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
|
830 for (i = h * stride - 1; i >= 0; i--) |
25951 | 831 tmp[i] = -srca[i]; |
16117 | 832 glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, tmp, stride, |
833 0, 0, w, h, 0); | |
834 free(tmp); | |
835 } | |
13653
799f81d3cb19
added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents:
13601
diff
changeset
|
836 #endif |
13585 | 837 |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
838 mpglBindTexture(gl_target, 0); |
13585 | 839 |
35011 | 840 osdcoords[osdtexCnt] = (struct osdcoords){x0, y0, w, h, sx, sy}; |
13585 | 841 |
842 osdtexCnt++; | |
843 } | |
844 | |
31809 | 845 #define RENDER_OSD 1 |
846 #define RENDER_EOSD 2 | |
847 | |
28803
6887c715c4fa
Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents:
28590
diff
changeset
|
848 /** |
6887c715c4fa
Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents:
28590
diff
changeset
|
849 * \param type bit 0: render OSD, bit 1: render EOSD |
6887c715c4fa
Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents:
28590
diff
changeset
|
850 */ |
6887c715c4fa
Do not rely on draw_osd to render the EOSD, instead draw it already at the
reimar
parents:
28590
diff
changeset
|
851 static void do_render_osd(int type) { |
35011 | 852 int i; |
31809 | 853 int draw_osd = (type & RENDER_OSD) && osdtexCnt > 0; |
854 int draw_eosd = (type & RENDER_EOSD) && eosdDispList; | |
31810 | 855 if (!draw_osd && !draw_eosd) |
856 return; | |
31811 | 857 // set special rendering parameters |
36171 | 858 mpglLoadMatrixf(osd_matrix); |
31811 | 859 mpglEnable(GL_BLEND); |
860 if (draw_eosd) { | |
35445 | 861 mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); |
31811 | 862 mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); |
863 mpglCallList(eosdDispList); | |
35445 | 864 mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); |
31811 | 865 } |
866 if (draw_osd) { | |
35445 | 867 if (osd_color != 0xffffff) |
868 mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); | |
31811 | 869 mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24)); |
870 // draw OSD | |
18719
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
871 #ifndef FAST_OSD |
35011 | 872 // render alpha |
31811 | 873 mpglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA); |
35011 | 874 for (i = 0; i < osdtexCnt; i++) { |
875 struct osdcoords *c = osdcoords + i; | |
876 mpglBindTexture(gl_target, osdatex[i]); | |
877 glDrawTex(c->x, c->y, c->w, c->h, 0, 0, c->w, c->h, c->sx, c->sy, using_tex_rect, 0, 0, 0); | |
878 } | |
18719
5d01eb066fa3
Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
reimar
parents:
18695
diff
changeset
|
879 #endif |
35011 | 880 // render luminance OSD |
31811 | 881 mpglBlendFunc(GL_SRC_ALPHA, GL_ONE); |
35011 | 882 for (i = 0; i < osdtexCnt; i++) { |
883 struct osdcoords *c = osdcoords + i; | |
884 mpglBindTexture(gl_target, osdtex[i]); | |
885 glDrawTex(c->x, c->y, c->w, c->h, 0, 0, c->w, c->h, c->sx, c->sy, using_tex_rect, 0, 0, 0); | |
886 } | |
35445 | 887 if (osd_color != 0xffffff) |
888 mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); | |
31811 | 889 } |
890 // set rendering parameters back to defaults | |
891 mpglDisable(GL_BLEND); | |
36171 | 892 mpglLoadMatrixf(video_matrix); |
31811 | 893 mpglBindTexture(gl_target, 0); |
26840 | 894 } |
13585 | 895 |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
896 static void draw_osd(void) |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
897 { |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
898 if (!use_osd) return; |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
899 if (vo_osd_changed(0)) { |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
900 int osd_h, osd_w; |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
901 clearOSD(); |
36171 | 902 osd_w = scaled_osd ? image_width : draw_width; |
903 osd_h = scaled_osd ? image_height : draw_height; | |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
904 vo_draw_text_ext(osd_w, osd_h, ass_border_x, ass_border_y, ass_border_x, ass_border_y, |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
905 image_width, image_height, create_osd_texture); |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
906 } |
31809 | 907 if (vo_doublebuffering) do_render_osd(RENDER_OSD); |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
908 } |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
909 |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
910 static void do_render(void) { |
36127 | 911 mpglColor4ub(255, 255, 255, 255); |
36111 | 912 if (is_yuv || is_xyz || custom_prog) |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
913 glEnableYUVConversion(gl_target, yuvconvtype); |
31567 | 914 if (stereo_mode) { |
915 glEnable3DLeft(stereo_mode); | |
916 glDrawTex(0, 0, image_width, image_height, | |
917 0, 0, image_width >> 1, image_height, | |
918 texture_width, texture_height, | |
35005 | 919 using_tex_rect, is_yuv, |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
920 mpi_flipped ^ vo_flipped, stereo_mode == GL_3D_STIPPLE); |
31567 | 921 glEnable3DRight(stereo_mode); |
922 glDrawTex(0, 0, image_width, image_height, | |
923 image_width >> 1, 0, image_width >> 1, image_height, | |
924 texture_width, texture_height, | |
35005 | 925 using_tex_rect, is_yuv, |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
926 mpi_flipped ^ vo_flipped, stereo_mode == GL_3D_STIPPLE); |
31567 | 927 glDisable3D(stereo_mode); |
928 } else { | |
31573 | 929 glDrawTex(0, 0, image_width, image_height, |
930 0, 0, image_width, image_height, | |
931 texture_width, texture_height, | |
35005 | 932 using_tex_rect, is_yuv, |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
933 mpi_flipped ^ vo_flipped, 0); |
31567 | 934 } |
36111 | 935 if (is_yuv || is_xyz || custom_prog) |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
936 glDisableYUVConversion(gl_target, yuvconvtype); |
35393
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
937 did_render = 1; |
30084
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
938 } |
90755c6344c7
Move do_render_osd function to avoid a forward declaration.
reimar
parents:
30065
diff
changeset
|
939 |
26840 | 940 static void flip_page(void) { |
35616 | 941 int need_clear = aspect_scaling() && use_aspect; |
35393
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
942 // We might get an expose event between draw_image and its |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
943 // corresponding flip_page. |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
944 // For double-buffering we would then flip in a clear backbuffer. |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
945 // Easiest way to handle it is by keeping track if the |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
946 // current GL buffer contains a properly rendered video. |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
947 // did_render will always be false for single buffer. |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
948 if (!did_render) { |
35616 | 949 if (!vo_doublebuffering && need_clear) |
950 mpglClear(GL_COLOR_BUFFER_BIT); | |
35393
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
951 do_render(); |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
952 do_render_osd(RENDER_OSD | RENDER_EOSD); |
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
953 } |
35616 | 954 if (use_glFinish) mpglFinish(); |
955 | |
26841
3822def2c61d
Reorder flip_page to make moving around do_render call easier
reimar
parents:
26840
diff
changeset
|
956 if (vo_doublebuffering) { |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
957 glctx.swapGlBuffers(&glctx); |
35616 | 958 if (need_clear) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
959 mpglClear(GL_COLOR_BUFFER_BIT); |
35616 | 960 } else if (!use_glFinish) |
961 mpglFlush(); | |
962 | |
35393
67de02ade8af
Fix vo_gl sometimes drawing a black image instead of the video.
reimar
parents:
35382
diff
changeset
|
963 did_render = 0; |
1 | 964 } |
965 | |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
966 static void redraw(void) { |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
967 flip_page(); |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
968 } |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
969 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
970 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) |
1 | 971 { |
28035 | 972 mpi_flipped = stride[0] < 0; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
973 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
|
974 x, y, w, h, slice_height); |
30097 | 975 if (is_yuv) { |
976 int xs, ys; | |
33365
706871635af7
Make mp_get_chroma_shift simpler/more generic and add an argument
reimar
parents:
33305
diff
changeset
|
977 mp_get_chroma_shift(image_format, &xs, &ys, NULL); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
978 mpglActiveTexture(GL_TEXTURE1); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
979 glUploadTex(gl_target, gl_format, gl_type, src[1], stride[1], |
30097 | 980 x >> xs, y >> ys, w >> xs, h >> ys, slice_height); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
981 mpglActiveTexture(GL_TEXTURE2); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
982 glUploadTex(gl_target, gl_format, gl_type, src[2], stride[2], |
30097 | 983 x >> xs, y >> ys, w >> xs, h >> ys, slice_height); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
984 mpglActiveTexture(GL_TEXTURE0); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
985 } |
19580
dd2312f887a6
Cosmetics: reindent, remove tabs and break overlong lines.
reimar
parents:
19579
diff
changeset
|
986 return 0; |
1 | 987 } |
988 | |
36179 | 989 static int get_pbo_image(mp_image_t *mpi) { |
28065 | 990 int needed_size; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
991 if (!mpglGenBuffers || !mpglBindBuffer || !mpglBufferData || !mpglMapBuffer) { |
16099 | 992 if (!err_shown) |
993 mp_msg(MSGT_VO, MSGL_ERR, "[gl] extensions missing for dr\n" | |
994 "Expect a _major_ speed penalty\n"); | |
16113 | 995 err_shown = 1; |
36179 | 996 return 0; |
27169
78d837adc71e
100l: finally understood ATI PBO problem: width must be a power of two.
reimar
parents:
27168
diff
changeset
|
997 } |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
998 mpi->stride[0] = mpi->width * mpi->bpp / 8; |
34810 | 999 needed_size = mpi->stride[0] * mpi->height + 31; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1000 if (mesa_buffer) { |
30023 | 1001 #ifdef CONFIG_GL_X11 |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1002 if (mesa_bufferptr && needed_size > mesa_buffersize) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1003 mpglFreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1004 mesa_bufferptr = NULL; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1005 } |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1006 if (!mesa_bufferptr) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1007 mesa_bufferptr = mpglAllocateMemoryMESA(mDisplay, mScreen, needed_size, 0, 1.0, 1.0); |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1008 mesa_buffersize = needed_size; |
29648
74f94f407c31
Re-add some ifdefs, partially reverting r29688, since mDisplay and
reimar
parents:
29646
diff
changeset
|
1009 #endif |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1010 mpi->planes[0] = mesa_bufferptr; |
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1011 } else { |
28068 | 1012 if (!gl_buffer) |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1013 mpglGenBuffers(1, &gl_buffer); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1014 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); |
28068 | 1015 if (needed_size > gl_buffersize) { |
1016 gl_buffersize = needed_size; | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1017 mpglBufferData(GL_PIXEL_UNPACK_BUFFER, gl_buffersize, |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1018 NULL, GL_DYNAMIC_DRAW); |
28068 | 1019 } |
1020 if (!gl_bufferptr) | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1021 gl_bufferptr = mpglMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY); |
34810 | 1022 mpi->priv = gl_bufferptr; |
1023 mpi->planes[0] = (uint8_t *)gl_bufferptr + (-(intptr_t)gl_bufferptr & 31); | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1024 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1025 } |
28035 | 1026 if (!mpi->planes[0]) { |
16113 | 1027 if (!err_shown) |
25754 | 1028 mp_msg(MSGT_VO, MSGL_ERR, "[gl] could not acquire buffer for dr\n" |
16113 | 1029 "Expect a _major_ speed penalty\n"); |
1030 err_shown = 1; | |
36179 | 1031 return 0; |
16113 | 1032 } |
30097 | 1033 if (is_yuv) { |
1034 // planar YUV | |
1035 int xs, ys; | |
34723 | 1036 int bpp; |
1037 mp_get_chroma_shift(image_format, &xs, &ys, &bpp); | |
1038 bpp = (bpp + 7) / 8; | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1039 mpi->flags |= MP_IMGFLAG_COMMON_STRIDE | MP_IMGFLAG_COMMON_PLANE; |
34723 | 1040 mpi->stride[0] = mpi->width * bpp; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1041 mpi->planes[1] = mpi->planes[0] + mpi->stride[0] * mpi->height; |
34723 | 1042 mpi->stride[1] = (mpi->width >> xs) * bpp; |
30097 | 1043 mpi->planes[2] = mpi->planes[1] + mpi->stride[1] * (mpi->height >> ys); |
34723 | 1044 mpi->stride[2] = mpi->stride[1]; |
28074
24871084fad6
ati_hack only makes sense when PBOs are used, not with mesa_buffer.
reimar
parents:
28073
diff
changeset
|
1045 if (ati_hack && !mesa_buffer) { |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1046 mpi->flags &= ~MP_IMGFLAG_COMMON_PLANE; |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1047 if (!gl_buffer_uv[0]) mpglGenBuffers(2, gl_buffer_uv); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1048 if (mpi->stride[1] * mpi->height > gl_buffersize_uv) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1049 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1050 mpglBufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[1] * mpi->height, |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1051 NULL, GL_DYNAMIC_DRAW); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1052 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1053 mpglBufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[1] * mpi->height, |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1054 NULL, GL_DYNAMIC_DRAW); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1055 gl_buffersize_uv = mpi->stride[1] * mpi->height; |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1056 } |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1057 if (!gl_bufferptr_uv[0]) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1058 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1059 gl_bufferptr_uv[0] = mpglMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1060 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1061 gl_bufferptr_uv[1] = mpglMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1062 } |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1063 mpi->planes[1] = gl_bufferptr_uv[0]; |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1064 mpi->planes[2] = gl_bufferptr_uv[1]; |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1065 } |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1066 } |
36179 | 1067 return 1; |
1068 } | |
1069 | |
1070 static uint32_t get_image(mp_image_t *mpi) { | |
1071 dr_rejectcnt++; | |
1072 if (gl_bufferptr) return VO_FALSE; | |
1073 if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE; | |
1074 if (mpi->type != MP_IMGTYPE_STATIC && mpi->type != MP_IMGTYPE_TEMP && | |
1075 mpi->type != MP_IMGTYPE_IPB && | |
1076 mpi->type != MP_IMGTYPE_NUMBERED) | |
1077 return VO_FALSE; | |
1078 if (mesa_buffer) mpi->width = texture_width; | |
1079 else if (ati_hack) { | |
1080 mpi->width = texture_width; | |
1081 mpi->height = texture_height; | |
1082 } | |
1083 if (!get_pbo_image(mpi)) | |
1084 return VO_FALSE; | |
16099 | 1085 mpi->flags |= MP_IMGFLAG_DIRECT; |
34819 | 1086 dr_rejectcnt--; |
16099 | 1087 return VO_TRUE; |
1088 } | |
1089 | |
28164 | 1090 static void clear_border(uint8_t *dst, int start, int stride, int height, int full_height, int value) { |
1091 int right_border = stride - start; | |
1092 int bottom_border = full_height - height; | |
1093 while (height > 0) { | |
1094 memset(dst + start, value, right_border); | |
1095 dst += stride; | |
1096 height--; | |
1097 } | |
1098 if (bottom_border > 0) | |
1099 memset(dst, value, stride * bottom_border); | |
1100 } | |
1101 | |
16092 | 1102 static uint32_t draw_image(mp_image_t *mpi) { |
35005 | 1103 // Ask for TexImage instead of TexSubImage for the rectangle + YCBCR + nodr special case. |
1104 int slice = gl_target == GL_TEXTURE_RECTANGLE && gl_format == GL_YCBCR_422_APPLE ? -1 : slice_height; | |
26681 | 1105 int stride[3]; |
1106 unsigned char *planes[3]; | |
1107 mp_image_t mpi2 = *mpi; | |
27874
b59875975f93
Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents:
27621
diff
changeset
|
1108 int w = mpi->w, h = mpi->h; |
34819 | 1109 imgcnt++; |
16092 | 1110 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
1111 goto skip_upload; |
34819 | 1112 dr_imgcnt += !!(mpi->flags & MP_IMGFLAG_DIRECT); |
26681 | 1113 mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP; |
1114 mpi2.width = mpi2.w; mpi2.height = mpi2.h; | |
1115 if (force_pbo && !(mpi->flags & MP_IMGFLAG_DIRECT) && !gl_bufferptr && get_image(&mpi2) == VO_TRUE) { | |
34723 | 1116 int bpp; |
1117 int line_bytes, line_bytes_c; | |
30097 | 1118 int xs, ys; |
34723 | 1119 mp_get_chroma_shift(image_format, &xs, &ys, &bpp); |
1120 bpp = is_yuv ? (bpp + 7) & ~7 : mpi->bpp; | |
1121 line_bytes = mpi->w * bpp / 8; | |
1122 line_bytes_c = (mpi->w >> xs) * bpp / 8; | |
1123 memcpy_pic(mpi2.planes[0], mpi->planes[0], line_bytes, mpi->h, mpi2.stride[0], mpi->stride[0]); | |
30097 | 1124 if (is_yuv) { |
34723 | 1125 memcpy_pic(mpi2.planes[1], mpi->planes[1], line_bytes_c, mpi->h >> ys, mpi2.stride[1], mpi->stride[1]); |
1126 memcpy_pic(mpi2.planes[2], mpi->planes[2], line_bytes_c, mpi->h >> ys, mpi2.stride[2], mpi->stride[2]); | |
26681 | 1127 } |
28164 | 1128 if (ati_hack) { // since we have to do a full upload we need to clear the borders |
34723 | 1129 clear_border(mpi2.planes[0], line_bytes, mpi2.stride[0], mpi->h, mpi2.height, 0); |
30097 | 1130 if (is_yuv) { |
34723 | 1131 clear_border(mpi2.planes[1], line_bytes_c, mpi2.stride[1], mpi->h >> ys, mpi2.height >> ys, 128); |
1132 clear_border(mpi2.planes[2], line_bytes_c, mpi2.stride[2], mpi->h >> ys, mpi2.height >> ys, 128); | |
28164 | 1133 } |
1134 } | |
26681 | 1135 mpi = &mpi2; |
1136 } | |
1137 stride[0] = mpi->stride[0]; stride[1] = mpi->stride[1]; stride[2] = mpi->stride[2]; | |
1138 planes[0] = mpi->planes[0]; planes[1] = mpi->planes[1]; planes[2] = mpi->planes[2]; | |
28035 | 1139 mpi_flipped = stride[0] < 0; |
28070
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
1140 if (mpi->flags & MP_IMGFLAG_DIRECT) { |
28073 | 1141 if (mesa_buffer) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1142 mpglPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 1); |
28073 | 1143 w = texture_width; |
1144 } else { | |
34810 | 1145 intptr_t base = (intptr_t)mpi->priv; |
28072 | 1146 if (ati_hack) { w = texture_width; h = texture_height; } |
28071 | 1147 if (mpi_flipped) |
1148 base += (mpi->h - 1) * stride[0]; | |
1149 planes[0] -= base; | |
1150 planes[1] -= base; | |
1151 planes[2] -= base; | |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1152 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1153 mpglUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); |
28071 | 1154 gl_bufferptr = NULL; |
1155 if (!(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) | |
1156 planes[0] = planes[1] = planes[2] = NULL; | |
28070
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
1157 } |
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
1158 slice = 0; // always "upload" full texture |
16099 | 1159 } |
18995 | 1160 glUploadTex(gl_target, gl_format, gl_type, planes[0], stride[0], |
27874
b59875975f93
Fix ati-hack to work again with ATI 8.9 and later drivers.
reimar
parents:
27621
diff
changeset
|
1161 mpi->x, mpi->y, w, h, slice); |
30097 | 1162 if (is_yuv) { |
1163 int xs, ys; | |
33365
706871635af7
Make mp_get_chroma_shift simpler/more generic and add an argument
reimar
parents:
33305
diff
changeset
|
1164 mp_get_chroma_shift(image_format, &xs, &ys, NULL); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1165 if ((mpi->flags & MP_IMGFLAG_DIRECT) && !(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1166 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[0]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1167 mpglUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1168 gl_bufferptr_uv[0] = NULL; |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1169 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1170 mpglActiveTexture(GL_TEXTURE1); |
18995 | 1171 glUploadTex(gl_target, gl_format, gl_type, planes[1], stride[1], |
30097 | 1172 mpi->x >> xs, mpi->y >> ys, w >> xs, h >> ys, slice); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1173 if ((mpi->flags & MP_IMGFLAG_DIRECT) && !(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1174 mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer_uv[1]); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1175 mpglUnmapBuffer(GL_PIXEL_UNPACK_BUFFER); |
27987
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1176 gl_bufferptr_uv[1] = NULL; |
292b260ac2df
More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
reimar
parents:
27927
diff
changeset
|
1177 } |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1178 mpglActiveTexture(GL_TEXTURE2); |
18995 | 1179 glUploadTex(gl_target, gl_format, gl_type, planes[2], stride[2], |
30097 | 1180 mpi->x >> xs, mpi->y >> ys, w >> xs, h >> ys, slice); |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1181 mpglActiveTexture(GL_TEXTURE0); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1182 } |
28070
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
1183 if (mpi->flags & MP_IMGFLAG_DIRECT) { |
30945
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1184 if (mesa_buffer) mpglPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 0); |
55917a674d7d
Add mpgl prefix to all OpenGL-related function pointers.
reimar
parents:
30721
diff
changeset
|
1185 else mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); |
28070
9c1fdc6420be
100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
reimar
parents:
28069
diff
changeset
|
1186 } |
26842
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
1187 skip_upload: |
c675462d66d9
Render everything as early as possible, doing as little as possible in
reimar
parents:
26841
diff
changeset
|
1188 if (vo_doublebuffering) do_render(); |
16092 | 1189 return VO_TRUE; |
1190 } | |
1 | 1191 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
1192 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
|
1193 draw_frame(uint8_t *src[]) |
1 | 1194 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28939
diff
changeset
|
1195 return VO_ERROR; |
1 | 1196 } |
1197 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16117
diff
changeset
|
1198 static int |
1 | 1199 query_format(uint32_t format) |
1200 { | |
33365
706871635af7
Make mp_get_chroma_shift simpler/more generic and add an argument
reimar
parents:
33305
diff
changeset
|
1201 int depth; |
16092 | 1202 int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | |
36128 | 1203 VFCAP_FLIP | VFCAP_ACCEPT_STRIDE | |
35889 | 1204 VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; |
13585 | 1205 if (use_osd) |
23135
960434b7d963
Do not set VFCAP_EOSD_UNSCALED if we use scaled-osd
reimar
parents:
23134
diff
changeset
|
1206 caps |= VFCAP_OSD | VFCAP_EOSD | (scaled_osd ? 0 : VFCAP_EOSD_UNSCALED); |
28035 | 1207 if (format == IMGFMT_RGB24 || format == IMGFMT_RGBA) |
13585 | 1208 return caps; |
33365
706871635af7
Make mp_get_chroma_shift simpler/more generic and add an argument
reimar
parents:
33305
diff
changeset
|
1209 if (use_yuv && mp_get_chroma_shift(format, NULL, NULL, &depth) && |
33414 | 1210 (depth == 8 || depth == 16 || glYUVLargeRange(use_yuv)) && |
30110 | 1211 (IMGFMT_IS_YUVP16_NE(format) || !IMGFMT_IS_YUVP16(format))) |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1212 return caps; |
36111 | 1213 if ((MASK_NOT_COMBINERS & (1 << use_yuv)) && IMGFMT_IS_XYZ(format)) |
1214 return caps; | |
19356
595ac8077dc5
Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to.
reimar
parents:
18996
diff
changeset
|
1215 // 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
|
1216 // 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
|
1217 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
|
1218 return 0; |
35005 | 1219 if (!use_ycbcr && (format == IMGFMT_YUY2 || format == IMGFMT_UYVY)) |
28059
8f43ff543dc6
Add support for YCBCR MESA texture format to vo_gl.
reimar
parents:
28035
diff
changeset
|
1220 return 0; |
14078
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13993
diff
changeset
|
1221 if (many_fmts && |
c4033dcb986f
More similar code from gl and gl2 moved to gl_common
reimar
parents:
13993
diff
changeset
|
1222 glFindFormat(format, NULL, NULL, NULL, NULL)) |
13585 | 1223 return caps; |
1 | 1224 return 0; |
1225 } | |
1226 | |
1227 | |
1228 static void | |
1229 uninit(void) | |
1230 { | |
16433 | 1231 uninitGl(); |
32537
8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
cboesch
parents:
32533
diff
changeset
|
1232 free(custom_prog); |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1233 custom_prog = NULL; |
32537
8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
cboesch
parents:
32533
diff
changeset
|
1234 free(custom_tex); |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1235 custom_tex = NULL; |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
1236 uninit_mpglcontext(&glctx); |
1 | 1237 } |
4352 | 1238 |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1239 static int valid_backend(void *p) |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1240 { |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1241 int *backend = p; |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1242 return *backend >= GLTYPE_AUTO && *backend < GLTYPE_COUNT; |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1243 } |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1244 |
30119
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1245 static int valid_csp(void *p) |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1246 { |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1247 int *csp = p; |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1248 return *csp >= -1 && *csp < MP_CSP_COUNT; |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1249 } |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1250 |
30293
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1251 static int valid_csp_lvl(void *p) |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1252 { |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1253 int *lvl = p; |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1254 return *lvl >= -1 && *lvl < MP_CSP_LEVELCONV_COUNT; |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1255 } |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1256 |
28828
56eee6ffba9b
Make data related to suboption parsing const in libvo
reimar
parents:
28814
diff
changeset
|
1257 static const opt_t subopts[] = { |
14286 | 1258 {"manyfmts", OPT_ARG_BOOL, &many_fmts, NULL}, |
1259 {"osd", OPT_ARG_BOOL, &use_osd, NULL}, | |
1260 {"scaled-osd", OPT_ARG_BOOL, &scaled_osd, NULL}, | |
1261 {"aspect", OPT_ARG_BOOL, &use_aspect, NULL}, | |
28059
8f43ff543dc6
Add support for YCBCR MESA texture format to vo_gl.
reimar
parents:
28035
diff
changeset
|
1262 {"ycbcr", OPT_ARG_BOOL, &use_ycbcr, NULL}, |
30122
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
30121
diff
changeset
|
1263 {"slice-height", OPT_ARG_INT, &slice_height, int_non_neg}, |
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
30121
diff
changeset
|
1264 {"rectangle", OPT_ARG_INT, &use_rectangle,int_non_neg}, |
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
30121
diff
changeset
|
1265 {"yuv", OPT_ARG_INT, &use_yuv, int_non_neg}, |
30119
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1266 {"colorspace", OPT_ARG_INT, &colorspace, valid_csp}, |
30293
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1267 {"levelconv", OPT_ARG_INT, &levelconv, valid_csp_lvl}, |
30122
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
30121
diff
changeset
|
1268 {"lscale", OPT_ARG_INT, &lscale, int_non_neg}, |
1772a5171ac7
Fix function declarations to avoid casting function pointers.
reimar
parents:
30121
diff
changeset
|
1269 {"cscale", OPT_ARG_INT, &cscale, int_non_neg}, |
26836
ba086caf1230
Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents:
26834
diff
changeset
|
1270 {"filter-strength", OPT_ARG_FLOAT, &filter_strength, NULL}, |
33927 | 1271 {"noise-strength", OPT_ARG_FLOAT, &noise_strength, NULL}, |
26677
e3ae3a37ea8a
Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents:
26624
diff
changeset
|
1272 {"ati-hack", OPT_ARG_BOOL, &ati_hack, NULL}, |
26681 | 1273 {"force-pbo", OPT_ARG_BOOL, &force_pbo, NULL}, |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1274 {"mesa-buffer", OPT_ARG_BOOL, &mesa_buffer, NULL}, |
16235 | 1275 {"glfinish", OPT_ARG_BOOL, &use_glFinish, NULL}, |
16268 | 1276 {"swapinterval", OPT_ARG_INT, &swap_interval,NULL}, |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1277 {"customprog", OPT_ARG_MSTRZ,&custom_prog, NULL}, |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1278 {"customtex", OPT_ARG_MSTRZ,&custom_tex, NULL}, |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1279 {"customtlin", OPT_ARG_BOOL, &custom_tlin, NULL}, |
18963 | 1280 {"customtrect", OPT_ARG_BOOL, &custom_trect, NULL}, |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
1281 {"mipmapgen", OPT_ARG_BOOL, &mipmap_gen, 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
|
1282 {"osdcolor", OPT_ARG_INT, &osd_color, NULL}, |
31567 | 1283 {"stereo", OPT_ARG_INT, &stereo_mode, NULL}, |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
1284 {"stipple", OPT_ARG_INT, &stipple, NULL}, |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1285 {"backend", OPT_ARG_INT, &backend, valid_backend}, |
14286 | 1286 {NULL} |
1287 }; | |
1288 | |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1289 static int preinit_internal(const char *arg, int allow_sw) |
4352 | 1290 { |
14286 | 1291 // set defaults |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1292 backend = GLTYPE_AUTO; |
16012 | 1293 many_fmts = 1; |
31023
769929c96d44
Disable OSD support by default if the necessary OpenGL functionality is missing.
reimar
parents:
31022
diff
changeset
|
1294 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
|
1295 scaled_osd = 0; |
13601 | 1296 use_aspect = 1; |
35008 | 1297 use_ycbcr = -1; |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1298 use_yuv = -1; |
30119
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1299 colorspace = -1; |
30293
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1300 levelconv = -1; |
18619
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
1301 lscale = 0; |
106a0c366002
Reworked YUV2RGB fragment program setup in preparation for upcoming patches
reimar
parents:
18579
diff
changeset
|
1302 cscale = 0; |
26836
ba086caf1230
Add a filter strength parameter for blurring/sharpening scalers.
reimar
parents:
26834
diff
changeset
|
1303 filter_strength = 0.5; |
33927 | 1304 noise_strength = 0.0; |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
1305 use_rectangle = -1; |
16235 | 1306 use_glFinish = 0; |
28091
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
1307 ati_hack = -1; |
c6ead2b85569
Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
reimar
parents:
28074
diff
changeset
|
1308 force_pbo = -1; |
28067
7511f7328d93
Add experimental support for glXAllocateMemoryMESA
reimar
parents:
28065
diff
changeset
|
1309 mesa_buffer = 0; |
16268 | 1310 swap_interval = 1; |
23878
e64c59f73527
Set -vo gl slice-height default to 0, the current default of 4 seems
reimar
parents:
23655
diff
changeset
|
1311 slice_height = 0; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1312 custom_prog = NULL; |
16593
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1313 custom_tex = NULL; |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1314 custom_tlin = 1; |
18963 | 1315 custom_trect = 0; |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
1316 mipmap_gen = 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
|
1317 osd_color = 0xffffff; |
31567 | 1318 stereo_mode = 0; |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
1319 stipple = 0x0f0f; |
14286 | 1320 if (subopt_parse(arg, subopts) != 0) { |
13237
f85c105bfeaa
improved suboption parsing, fixes also compiler warnings
reimar
parents:
13206
diff
changeset
|
1321 mp_msg(MSGT_VO, MSGL_FATAL, |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1322 "\n-vo gl command line help:\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1323 "Example: mplayer -vo gl:slice-height=4\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1324 "\nOptions:\n" |
22087 | 1325 " nomanyfmts\n" |
1326 " Disable extended color formats for OpenGL 1.2 and later\n" | |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1327 " slice-height=<0-...>\n" |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1328 " Slice size for texture transfer, 0 for whole image\n" |
13585 | 1329 " noosd\n" |
1330 " Do not use OpenGL OSD code\n" | |
28060
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1331 " scaled-osd\n" |
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1332 " Render OSD at movie resolution and scale it\n" |
13601 | 1333 " noaspect\n" |
1334 " Do not do aspect scaling\n" | |
16099 | 1335 " rectangle=<0,1,2>\n" |
1336 " 0: use power-of-two textures\n" | |
1337 " 1: use texture_rectangle\n" | |
1338 " 2: use texture_non_power_of_two\n" | |
26677
e3ae3a37ea8a
Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents:
26624
diff
changeset
|
1339 " ati-hack\n" |
e3ae3a37ea8a
Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfers
reimar
parents:
26624
diff
changeset
|
1340 " Workaround ATI bug with PBOs\n" |
26681 | 1341 " force-pbo\n" |
1342 " Force use of PBO even if this involves an extra memcpy\n" | |
16235 | 1343 " glfinish\n" |
1344 " Call glFinish() before swapping buffers\n" | |
16268 | 1345 " swapinterval=<n>\n" |
1346 " Interval in displayed frames between to buffer swaps.\n" | |
1347 " 1 is equivalent to enable VSYNC, 0 to disable VSYNC.\n" | |
1348 " Requires GLX_SGI_swap_control support to work.\n" | |
30033 | 1349 " ycbcr\n" |
35006 | 1350 " also try to use the GL_APPLE_ycbcr_422 extension\n" |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1351 " yuv=<n>\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1352 " 0: use software YUV to RGB conversion.\n" |
16626 | 1353 " 1: use register combiners (nVidia only, for older cards).\n" |
36105
10a63b5e6513
Enable/disable extra instructions for gamma correction
reimar
parents:
35895
diff
changeset
|
1354 " 2: use fragment program with gamma correction.\n" |
10a63b5e6513
Enable/disable extra instructions for gamma correction
reimar
parents:
35895
diff
changeset
|
1355 " 3: same as 2.\n" |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1356 " 4: use fragment program with gamma correction via lookup.\n" |
16626 | 1357 " 5: use ATI-specific method (for older cards).\n" |
22087 | 1358 " 6: use lookup via 3D texture.\n" |
35007 | 1359 " colorspace=<n>\n" |
30119
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1360 " 0: MPlayer's default YUV to RGB conversion\n" |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1361 " 1: YUV to RGB according to BT.601\n" |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1362 " 2: YUV to RGB according to BT.709\n" |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1363 " 3: YUV to RGB according to SMPT-240M\n" |
f5d435782075
Make YUV->RGB conversion coefficients selectable for -vo gl.
reimar
parents:
30110
diff
changeset
|
1364 " 4: YUV to RGB according to EBU\n" |
30121
28cbec606cbb
Slightly generalize code to generate YUV->RGB conversion table and add
reimar
parents:
30119
diff
changeset
|
1365 " 5: XYZ to RGB\n" |
30293
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1366 " levelconv=<n>\n" |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1367 " 0: YUV to RGB converting TV to PC levels\n" |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1368 " 1: YUV to RGB converting PC to TV levels\n" |
aeab18b1923d
Add support for adjustable TV <-> PC level conversion.
reimar
parents:
30151
diff
changeset
|
1369 " 2: YUV to RGB without converting levels\n" |
18695 | 1370 " lscale=<n>\n" |
1371 " 0: use standard bilinear scaling for luma.\n" | |
1372 " 1: use improved bicubic scaling for luma.\n" | |
22489 | 1373 " 2: use cubic in X, linear in Y direction scaling for luma.\n" |
25728 | 1374 " 3: as 1 but without using a lookup texture.\n" |
28060
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1375 " 4: experimental unsharp masking (sharpening).\n" |
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1376 " 5: experimental unsharp masking (sharpening) with larger radius.\n" |
18695 | 1377 " cscale=<n>\n" |
1378 " as lscale but for chroma (2x slower with little visible effect).\n" | |
28060
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1379 " filter-strength=<value>\n" |
70a2108520eb
Add some forgotten documentation for gl suboptions
reimar
parents:
28059
diff
changeset
|
1380 " set the effect strength for some lscale/cscale filters\n" |
33927 | 1381 " noise-strength=<value>\n" |
1382 " set how much noise to add. 1.0 is suitable for dithering to 6 bit.\n" | |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1383 " customprog=<filename>\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1384 " use a custom YUV conversion program\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1385 " customtex=<filename>\n" |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1386 " 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
|
1387 " nocustomtlin\n" |
1c13fb2ba5a9
Allow specifying a custom (ppm) texture for texture unit 3
reimar
parents:
16586
diff
changeset
|
1388 " use GL_NEAREST scaling for customtex texture\n" |
18963 | 1389 " customtrect\n" |
1390 " use texture_rectangle for customtex texture\n" | |
30030
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
1391 " mipmapgen\n" |
791920428fbd
Add support for auto-generating mipmaps in vo_gl, should ease
reimar
parents:
30029
diff
changeset
|
1392 " generate mipmaps for the video image (use with TXB in customprog)\n" |
25952 | 1393 " osdcolor=<0xAARRGGBB>\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
|
1394 " use the given color for the OSD\n" |
34375 | 1395 " stereo=<n> (add 32 to swap left and right)\n" |
31567 | 1396 " 0: normal display\n" |
1397 " 1: side-by-side to red-cyan stereo\n" | |
1398 " 2: side-by-side to green-magenta stereo\n" | |
31581
8f8c92592747
Independent tests indicate that GLX_STEREO is working fine on supported hardware.
cehoyos
parents:
31573
diff
changeset
|
1399 " 3: side-by-side to quadbuffer stereo\n" |
34983
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
1400 " 4: side-by-side to pixel pattern\n" |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
1401 " stipple=<0xBBBB>\n" |
0034a2bf7b42
Support interleaving the two frame halves from a 3D video
reimar
parents:
34874
diff
changeset
|
1402 " 16 bits representing 4x4 pattern to use for stereo=4\n" |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1403 " backend=<n>\n" |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1404 " -1: auto-select\n" |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1405 " 0: Win32/WGL\n" |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1406 " 1: X11/GLX\n" |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1407 " 2: SDL\n" |
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1408 " 3: X11/EGL (experimental)\n" |
35097 | 1409 " 4: OSX/Cocoa\n" |
36119 | 1410 " 5: Android (experimental)\n" |
12212
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1411 "\n" ); |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1412 return -1; |
2e8b305586a0
fixed suboption parsing, added help for suboptions
reimar
parents:
12159
diff
changeset
|
1413 } |
34350
27dead7f2593
Add a suboption to allow forcing use of e.g. OpenGL ES to -vo gl.
reimar
parents:
34338
diff
changeset
|
1414 if (!init_mpglcontext(&glctx, backend)) |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1415 goto err_out; |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1416 if (use_yuv == -1 || !allow_sw) { |
30465
3422423f2e20
Create the OpenGL probe window as a hidden Window on X11.
reimar
parents:
30447
diff
changeset
|
1417 if (create_window(320, 200, VOFLAG_HIDDEN, NULL) < 0) |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1418 goto err_out; |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1419 if (glctx.setGlWindow(&glctx) == SET_WINDOW_FAILED) |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1420 goto err_out; |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1421 if (!allow_sw && isSoftwareGl()) |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1422 goto err_out; |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1423 autodetectGlExtensions(); |
35008 | 1424 } else if (use_ycbcr == -1) { |
1425 // rare feature, not worth creating a window to detect | |
1426 use_ycbcr = 0; | |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1427 } |
30468
c43a5f466e1e
Print messages only after we are sure preinit will not fail anymore.
reimar
parents:
30465
diff
changeset
|
1428 if (many_fmts) |
c43a5f466e1e
Print messages only after we are sure preinit will not fail anymore.
reimar
parents:
30465
diff
changeset
|
1429 mp_msg(MSGT_VO, MSGL_INFO, "[gl] using extended formats. " |
c43a5f466e1e
Print messages only after we are sure preinit will not fail anymore.
reimar
parents:
30465
diff
changeset
|
1430 "Use -vo gl:nomanyfmts if playback fails.\n"); |
c43a5f466e1e
Print messages only after we are sure preinit will not fail anymore.
reimar
parents:
30465
diff
changeset
|
1431 mp_msg(MSGT_VO, MSGL_V, "[gl] Using %d as slice height " |
c43a5f466e1e
Print messages only after we are sure preinit will not fail anymore.
reimar
parents:
30465
diff
changeset
|
1432 "(0 means image height).\n", slice_height); |
34819 | 1433 imgcnt = dr_imgcnt = dr_rejectcnt = 0; |
7777 | 1434 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
1435 return 0; |
30447
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1436 |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1437 err_out: |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1438 uninit(); |
c84c27c3eafb
Add support for autodetection during preinit and use that to detect a default
reimar
parents:
30446
diff
changeset
|
1439 return -1; |
4352 | 1440 } |
1441 | |
30719
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1442 static int preinit(const char *arg) |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1443 { |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1444 return preinit_internal(arg, 1); |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1445 } |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1446 |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1447 static int preinit_nosw(const char *arg) |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1448 { |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1449 return preinit_internal(arg, 0); |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1450 } |
6f9652891876
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
reimar
parents:
30468
diff
changeset
|
1451 |
26822 | 1452 static const struct { |
1453 const char *name; | |
1454 int *value; | |
1455 int supportmask; | |
1456 } eq_map[] = { | |
1457 {"brightness", &eq_bri, MASK_NOT_COMBINERS}, | |
1458 {"contrast", &eq_cont, MASK_NOT_COMBINERS}, | |
1459 {"saturation", &eq_sat, MASK_ALL_YUV }, | |
1460 {"hue", &eq_hue, MASK_ALL_YUV }, | |
1461 {"gamma", &eq_rgamma, MASK_GAMMA_SUPPORT}, | |
1462 {"red_gamma", &eq_rgamma, MASK_GAMMA_SUPPORT}, | |
1463 {"green_gamma", &eq_ggamma, MASK_GAMMA_SUPPORT}, | |
1464 {"blue_gamma", &eq_bgamma, MASK_GAMMA_SUPPORT}, | |
1465 {NULL, NULL, 0 } | |
1466 }; | |
1467 | |
33305
ddb45e9443ec
Remove the variable arguments from the libvo control() functions.
iive
parents:
33301
diff
changeset
|
1468 static int control(uint32_t request, void *data) |
4352 | 1469 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1470 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1471 case VOCTRL_QUERY_FORMAT: |
28035 | 1472 return query_format(*(uint32_t*)data); |
16099 | 1473 case VOCTRL_GET_IMAGE: |
1474 return get_image(data); | |
16092 | 1475 case VOCTRL_DRAW_IMAGE: |
1476 return draw_image(data); | |
19578 | 1477 case VOCTRL_DRAW_EOSD: |
21506
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
1478 if (!data) |
8174acbf0633
Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents:
20420
diff
changeset
|
1479 return VO_FALSE; |
19578 | 1480 genEOSD(data); |
31809 | 1481 if (vo_doublebuffering) do_render_osd(RENDER_EOSD); |
19578 | 1482 return VO_TRUE; |
1483 case VOCTRL_GET_EOSD_RES: | |
1484 { | |
32391
b4c3659d16b1
Use a dynamic list for the sources of EOSD elements.
cigaes
parents:
32209
diff
changeset
|
1485 struct mp_eosd_settings *r = data; |
36171 | 1486 r->w = draw_width; r->h = draw_height; |
30065
d5d20b8256b7
Some ugly hacks to make compiling against a newer external version of libass work.
reimar
parents:
30063
diff
changeset
|
1487 r->srcw = image_width; r->srch = image_height; |
19578 | 1488 r->mt = r->mb = r->ml = r->mr = 0; |
1489 if (scaled_osd) {r->w = image_width; r->h = image_height;} | |
29524
b1a437cdc60d
Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
reimar
parents:
29521
diff
changeset
|
1490 else if (aspect_scaling()) { |
24787
02535b3216c5
Avoid text deformation and subtitles moving outside the screen in pan-and-scan
eugeni
parents:
23987
diff
changeset
|
1491 r->ml = r->mr = ass_border_x; |
02535b3216c5
Avoid text deformation and subtitles moving outside the screen in pan-and-scan
eugeni
parents:
23987
diff
changeset
|
1492 r->mt = r->mb = ass_border_y; |
19578 | 1493 } |
1494 } | |
1495 return VO_TRUE; | |
13843 | 1496 case VOCTRL_GUISUPPORT: |
1497 return VO_TRUE; | |
11542 | 1498 case VOCTRL_ONTOP: |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
1499 glctx.ontop(); |
11542 | 1500 return VO_TRUE; |
6095 | 1501 case VOCTRL_FULLSCREEN: |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
1502 glctx.fullscreen(); |
36156 | 1503 resize(); |
6095 | 1504 return VO_TRUE; |
17006
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16880
diff
changeset
|
1505 case VOCTRL_BORDER: |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
1506 glctx.border(); |
36156 | 1507 resize(); |
17006
852499addaa8
Enable border toggling for gl and gl2 under windows.
reimar
parents:
16880
diff
changeset
|
1508 return VO_TRUE; |
13601 | 1509 case VOCTRL_GET_PANSCAN: |
1510 if (!use_aspect) return VO_NOTIMPL; | |
1511 return VO_TRUE; | |
1512 case VOCTRL_SET_PANSCAN: | |
1513 if (!use_aspect) return VO_NOTIMPL; | |
36156 | 1514 resize(); |
13601 | 1515 return VO_TRUE; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1516 case VOCTRL_GET_EQUALIZER: |
30097 | 1517 if (is_yuv) { |
26822 | 1518 int i; |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1519 vf_equalizer_t *eq=data; |
26822 | 1520 for (i = 0; eq_map[i].name; i++) |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1521 if (strcmp(eq->item, eq_map[i].name) == 0) break; |
26822 | 1522 if (!(eq_map[i].supportmask & (1 << use_yuv))) |
1523 break; | |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1524 eq->value = *eq_map[i].value; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1525 return VO_TRUE; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1526 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1527 break; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1528 case VOCTRL_SET_EQUALIZER: |
30097 | 1529 if (is_yuv) { |
26822 | 1530 int i; |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1531 vf_equalizer_t *eq=data; |
26822 | 1532 for (i = 0; eq_map[i].name; i++) |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1533 if (strcmp(eq->item, eq_map[i].name) == 0) break; |
26822 | 1534 if (!(eq_map[i].supportmask & (1 << use_yuv))) |
1535 break; | |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1536 *eq_map[i].value = eq->value; |
35830 | 1537 if (strcmp(eq->item, "gamma") == 0) |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32808
diff
changeset
|
1538 eq_rgamma = eq_ggamma = eq_bgamma = eq->value; |
16488
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1539 update_yuvconv(); |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1540 return VO_TRUE; |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1541 } |
3191dcb27a12
hardware color-space conversion for vo_gl and vo_gl2
reimar
parents:
16474
diff
changeset
|
1542 break; |
22232 | 1543 case VOCTRL_UPDATE_SCREENINFO: |
29938
eb6c70e2cbea
Very preliminary code to allow selecting the OpenGL backend at runtime.
reimar
parents:
29906
diff
changeset
|
1544 glctx.update_xinerama_info(); |
22232 | 1545 return VO_TRUE; |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1546 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4448
diff
changeset
|
1547 return VO_NOTIMPL; |
4352 | 1548 } |