RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
30,986 Commits 41 Branches 86 Tags 159 MiB
Commit Graph

144 Commits

Author SHA1 Message Date
reimar e6455d7161 Check texture dimensions instead of internal format in max texture 
size check to work around OS X ATI driver bugs:
- does not keep format but use an equivalent one (1 becomes 0x8040).
- does not set to 0 on failure but to 0x8018


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31013 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:56:26 +00:00
reimar 3107620451 Cosmetics/reindent. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31012 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:44:03 +00:00
reimar 1a42a53fd2 Avoid duplicating a condition. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31011 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:42:52 +00:00
reimar 5e8cfc7230 Print width before height, 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31010 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:39:54 +00:00
reimar 475a831ac8 Fix width/height mixup in error message. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31009 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:38: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 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 09cf021307 Port yuv=... auto-detection from gl to gl2. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30753 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-26 21:41:42 +00:00
reimar cbd5caef0e Add support for adjustable TV <-> PC level conversion. 
This could also be done by modifying contrast and brightness, but
this seems a bit more flexible and easier to use.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30335 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-16 19:59:31 +00:00
reimar f102ac7a8c Fix function declarations to avoid casting function pointers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-01 13:18:49 +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 498ad7ba57 First steps to supporting different YUV->RGB conversion definitions. 
The numbers are possibly still wrong though.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30151 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-12-31 19:59:58 +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
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
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
reimar 4805ea9864 Add support for Windows OpenGL rendering onto a device instead of into a window. 
Has little use except for experimenting - on Windows 9x it could be used to
render on monitors that were not managed by Windows, but that feature was
removed in newer Windows versions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29946 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-21 22:27:40 +00:00
reimar f5c7d8c92f Use vo_w32_window directly instead of via the vo_window macro in Windows-only code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29689 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-18 18:25:17 +00:00
reimar a1f744cb07 Check setGlWindow return value to fail properly instead of crashing if e.g. 
no OpenGL support is available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29612 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-01 15:20:05 +00:00
reimar f6e58b8a99 Make gl2 code capable of windowed aspect and panscan (no user option to enable it yet though). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29567 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-27 18:42:08 +00:00
reimar 26d8e6a696 Fix video placement with -vo gl2 -fs -wid. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29565 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-27 14:12:38 +00:00
reimar f10dcbacd5 -vo gl2 resize does not need to modify its arguments, so pass int instead of int *. 
In particular, this avoids modifying vo_dwidth/vo_dheight which should only
be modified by the "windowing layer" (w32_common, x11_common).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29564 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-27 14:10:38 +00:00
reimar c2edb80335 Remove useless code that has no effect. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29562 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-27 14:01:39 +00:00
reimar 05119ecaf6 Make data related to suboption parsing const in libvo 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-07 08:51:40 +00:00
diego befc528297 Add standard license headers, unify header formatting. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-08 03:27:30 +00:00
reimar c351d29392 Factor common code like -wid handling, vo_gc creation etc. out into 
x11_common.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-19 20:19:25 +00:00
reimar 8cc27a3561 Remove explicit setting of vo_ontop since that is already done by vo_x11_create_vo_window 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27937 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-15 23:09:31 +00:00
diego 9992cbd580 Surround conditionally used function with corresponding #ifdef, fixes: 
libvo/vo_gl2.c:681: warning: 'gl_handlekey' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27754 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-13 14:40:58 +00:00
reimar 0e99017da9 Change glCreateClearTex to use the same host data format as later uploads. 
This fixes at least some of the massive performance problems the ATI drivers have.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27653 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-20 17:48:01 +00:00
diego 3b31fa5717 Rename two GUI-related preprocessor directives: 
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-30 13:44:59 +00:00
reimar 983800b76f Enable runtime border/window decorations-toggling for Linux gl and gl2 vos. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27338 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-22 18:46:07 +00:00
reimar 056b5b9457 Use a struct instead of a huge and further growing argument list. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26866 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-24 11:03:00 +00:00
reimar 3e3a2a4e05 Saner handling of VOCTRL_PAUSE/VOCTRL_RESUME 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26855 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-22 20:21:19 +00:00
diego ad603f5559 cosmetics: Remove useless parentheses from from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 08:33:27 +00:00
reimar 087dbfe99f Set vo_mouse_autohide in gl and gl2 vos, so the mouse hiding behaviour 
becomes the same as for the other vos using X11.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25513 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-22 20:17:57 +00:00
diego 8a00a66de3 Replace some more broken SYS_DARWIN preprocessor conditionals with __APPLE__. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25425 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-16 23:50:05 +00:00
reimar 2bf8c692f1 Mark the vo_functions_t definitions as const where possible. 
This is not possible for xover and anything supporting vidix
due to horrible hacks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25248 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 14:39:15 +00:00
reimar 909887bdbe Make vo info structs const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 14:06:03 +00:00
reimar 7b9f20c0ab Fix compilation after patch to remove global vo_hdc 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24335 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-03 13:18:26 +00:00
reimar f131aafff1 Make X11 window creation and (with -fixed-vo) management simpler and more 
consistent by introducing a new function that handles most of the
ugly things. Changes of behaviour with some vos is unavoidable, bug reports
welcome.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23675 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-27 10:26:13 +00:00
reimar 85f88efe84 Lots of cosmetics for gl2 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23671 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-26 16:33:43 +00:00
reimar 15d418e19b Remove two unused variables 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23670 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-26 15:51:51 +00:00
reimar d3bc927fc4 Remove overly complex and unused per-subtexture "dirty" handling 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23669 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-26 15:51:49 +00:00
reimar 92542f710b Remove now unused variable 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23668 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-26 15:51:47 +00:00
reimar db9f690747 remove useless calloc cast 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23667 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-26 15:51:43 +00:00
reimar 467d176cd1 Remove some unused code and useless error checking that only clutters the code 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23665 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-26 15:01:09 +00:00
diego 5c9abf7f9f Gui --> gui 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-23 07:42:42 +00:00
reimar 3c32a11ae5 Set classhint directly after creating window just as all other vos do, in accordance with ICCCM. 
Patch by Mark Tiefenbruck [mark at fluxbox org]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22266 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-18 20:23:25 +00:00
reimar 0fe4207dfb Move common vo initialization code to video_out.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22250 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-17 20:58:55 +00:00