RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-30 11:42:04 +00:00
Code Issues Releases Wiki Activity
32,011 Commits 41 Branches 86 Tags 134 MiB
776c0f93f5
Commit Graph

169 Commits

Author SHA1 Message Date
reimar
be6a58d455 vo_gl, csputils: dual-license under LGPL v2.1 
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as
an alternative to the GPL license.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31375 b3059339-0415-0410-9bf9-f77b7e298cf2

Allow LGPL for csputils as well, they were previously part of gl_common
and are still an important part of it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31376 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:07:42 +02:00
Uoti Urpala
18657beb19 Merge svn changes up to r31145 2010-05-30 15:21:18 +03:00
reimar
6f28f44c8c Handle chroma texture size becoming 0, e.g. due to bad rounding. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31143 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-09 00:16:46 +00:00
Uoti Urpala
f38efd166e Merge svn changes up to r31097 2010-04-26 19:23:32 +03:00
Uoti Urpala
837c48ddee Merge svn changes up to r31020 2010-04-26 18:06:00 +03:00
Uoti Urpala
e913d6c5da Merge svn changes up to r31004 2010-04-26 17:55:05 +03:00
Uoti Urpala
ff559b8e90 Merge svn changes up to r30907 2010-04-26 16:57:25 +03:00
reimar
a9ff7793e3 Support for auto-selecting the OpenGL backend. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31086 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 10:53:01 +00:00
reimar
3a34dbc927 Add reinitialization support. Necessary for fullscreen on OSX. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31085 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 10:44:53 +00:00
reimar
63c3c67294 Missing space in error message. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31083 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 10:12:39 +00:00
reimar
9661a675e5 Share SDL initialization code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31079 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 09:52:01 +00:00
reimar
25b9185f17 Fullscreen support for -vo gl using SDL. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31077 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 09:24:30 +00:00
reimar
a83117e972 Window resizing support for -vo gl with SDL backend. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31075 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 08:35:35 +00:00
reimar
7c2bef4bb5 Add sdl_common file and use it to share the input handling between -vo gl 
with SDL backend and -vo sdl.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31074 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 08:17:23 +00:00
reimar
5cdca55005 Use SDL_GL_ProcAddress to work around conflicts between -lGL 
and -framework OpenGL.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31073 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 07:32:42 +00:00
reimar
7fc3b782ea Update copyright and email address. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31072 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 06:52:13 +00:00
reimar
56af15374b Clarify that the GL_TEXT_FRAGMENT_SHADER_ATI bug workaround is for OSX, 
and which versions are known good/known bad.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31071 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-25 06:14:25 +00:00
reimar
f81cd34fe0 Add workaroound for yuv=7 mode - does hurt speed but not much 
and this code should only be used when it is the only option.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31068 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 22:13:57 +00:00
reimar
ccc269a00a Try harder to find linked OpenGL functions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31066 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 17:02:50 +00:00
reimar
29e713ba4b Some crash-resilience fixes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31063 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 16:49:46 +00:00
reimar
6e4458ffa3 First steps to support -vo gl with SDL-based Window handling. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31062 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-24 16:46:47 +00:00
reimar
b8a7ed8a79 Factor out the YUV->RGB conversion auto-selection and also 
enable auto-selection of ATI fragment shaders since they
should do accurate conversions now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31006 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 16:56:30 +00:00
reimar
22f6170009 Share more code between the two ATI fragment shader YUV to RGB 
conversion methods and extend them to support more accurate
conversion (though at the cost of some speed).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30995 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 11:45:05 +00:00
reimar
4a8486f844 Try to detect and work around broken glXGetProcAddress on at 
least PPC OS X 10.4.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30994 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-03 20:31:03 +00:00
reimar
269b96d75e Implement OpenGL-based YUV to RGB version for Radeon 9200 class 
cards on OS X.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30993 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-03 19:58:06 +00:00
reimar
0c6b8880ce Indentation fix. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30988 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-03 07:12:32 +00:00
reimar
2cebf8eeb7 Add mpgl prefix to all OpenGL-related function pointers. 
This is necessary because at least the GetString symbol
causes clashes on PPC OSX 10.4, causing -vo gl to always
crash.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30987 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-03 07:08:07 +00:00
reimar
e0c5806d44 Add newlines to generated fragment program to make both fragment program dump 
with -v more readable and compiler error message more understandable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30882 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-12 17:21:05 +00:00
Uoti Urpala
b0986b3760 Merge svn changes up to r30463 
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
 2010-03-09 18:59:15 +02:00
reimar
2817539ee6 Try the more specific names first for the SwapInterval function to make it less 
likely we get an incompatible one.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30451 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-28 18:06:47 +00:00
reimar
6eb02e5c5e glXSwapIntervalEXT is defined to take different arguments from glXSwapIntervalSGI, 
so do not try to use it.
Patch by Stephen Warren [swarren nvidia com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30450 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-28 18:01:19 +00:00
Uoti Urpala
b390b9b28f Merge svn changes up to r30185 2010-01-08 01:36:05 +02:00
Uoti Urpala
231b33a02f Merge svn changes up to r30165 2010-01-08 01:05:30 +02:00
reimar
f06aa83a83 Add pointers to a few more standard OpenGL functions to ease future extensions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30179 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-03 12:55:09 +00:00
reimar
a326622304 Add support for 16-bit per component YUV formats. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-31 22:53:25 +00:00
reimar
0ecf324ac5 Extract functions to generate yuv->rgb matrices and lookup tables into a 
separate file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-31 18:25:35 +00:00
reimar
c4c806a9d7 Put the colourspace-related variables into a separate struct to ease 
extracting the code and sharing with other vos.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30149 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-31 18:07:37 +00:00
reimar
8e35068138 Support all planar YUV formats in OpenGL vos. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30139 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-30 11:32:24 +00:00
Uoti Urpala
dc7f183022 Merge svn changes up to r30104 
Ignore the broken correct-pts change in r30100.
 2009-12-30 00:14:20 +02:00
Uoti Urpala
67b40bd219 Merge svn changes up to r30065 2009-12-29 23:57:14 +02:00
reimar
acd1630d1b Change %f to %e in generated fragment programs to avoid losing precision unnecessarily. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30078 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-20 14:32:34 +00:00
reimar
89a2a84868 Fix a broken indentation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30070 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-19 20:45:34 +00:00
reimar
213707b9e4 Enable running fragment programs with YUV_CONVERSION_NONE 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30069 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-19 20:44:55 +00:00
reimar
f97fd3eff0 Rename GL_* defines to CONFIG_GL_* 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30065 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-19 13:49:44 +00:00
reimar
140de2a9e2 Make the check for X11 and WIN32 backends for OpenGL separate. 
This fixes compilation on Windows with X11 but no GLX available.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30063 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-19 10:52:32 +00:00
Uoti Urpala
efcc9ad712 Merge svn changes up to r30055 2009-12-18 18:54:42 +02:00
reimar
80981cd2d0 Use a fallback to make sure the basic OpenGL functions are available instead of 
initializing them which does not work well with reinitializations.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29984 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-09 17:50:07 +00:00
reimar
c13aaf85d1 Prefer GLAPIENTRY over APIENTRY, it is the better name and used more by OpenGL headers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29983 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-09 17:36:55 +00:00
reimar
e64d47925a Pass all OpenGL functions through a function pointer indirection. 
This still needs more work, but should allow supporting e.g. GLX-OpenGL
and Win32-OpenGL with a single binary.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29981 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-08 23:32:51 +00:00
reimar
2661039ada Very preliminary code to allow selecting the OpenGL backend at runtime. 
Works in the currently supported cases for only Win32 and only X11,
the mixed case is not working yet though.
But applied anyway since the code is slightly less messy than the current one.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29980 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-08 06:42:46 +00:00