RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
26,489 Commits 41 Branches 85 Tags 164 MiB
Commit Graph

176 Commits

Author SHA1 Message Date
Uoti Urpala 6c9d09170d vo_gl[2]: Rename conflicting vo_ontop macro 
Rename the vo_ontop() macro to vo_gl_ontop(). It caused problems with
other changes because it conflicts with a global variable name (gl2
actually called vo_ontop() as a function and used vo_ontop as an int -
this only worked because vo_ontop was defined as a function-like macro
and use without parentheses didn't trigger replacement).
 2008-04-23 13:41:06 +03:00
Uoti Urpala de56d2d9f5 Remove variable arguments from vo control() functions 
No voctrl uses them any more, and using them would not be a good idea
because it makes forwarding arguments to other functions harder.
 2008-04-23 13:41:03 +03:00
Uoti Urpala dbe080ec9f Change VOCTRL_[GET|SET]_EQUALIZER argument passing 
These were the only voctrl types with more than one argument. The
second argument was passed using variable arguments. Change them to
use a single argument (address of a struct containing both old
arguments). This makes forwarding the arguments to other functions
easier and allows simplifying code.
 2008-04-23 13:41:03 +03:00
reimar 19578c6960 Slightly document alpha for OSD color 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25984 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-11 19:01:34 +00:00
reimar 2d79c4c109 Support alpha for vo gl osdcolor 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25983 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-11 19:00:01 +00:00
reimar ea8ae01ee0 Redraw display on toggling border 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25944 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-01 12:22:12 +00:00
reimar 6d879f70c7 Always redraw video on resize. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25943 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-31 00:07:28 +00:00
reimar ab2518c5fe Small typo in message 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25782 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-18 18:16:32 +00:00
reimar 1fbd767ef6 Add experimental unsharp-mask OpenGL scaler. Certainly not yet perfect. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25757 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-15 17:59:20 +00:00
reimar 6fed08aee3 Document vo gl lscale=3 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25756 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-15 17:54:48 +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
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
eugeni 92efd606d1 Avoid text deformation and subtitles moving outside the screen in pan-and-scan 
mode.

For this, crop amounts are passed from vo_gl as negative margins sizes. They
are used to calculate aspect ratio. They are ignored when calculating subtitle
 positions, so subtitles will stay on screen most of the time.
Based on a patch by Jindrich Makovicka [makovick gmail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24815 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-10-19 18:16:23 +00:00
reimar e58803edde Handle case where get_image is called twice without a draw_image in-between 
(-vc ffmpeg12 seems to do this sometimes).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24007 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-03 18:29:54 +00:00
reimar acad91a5d2 Set -vo gl slice-height default to 0, the current default of 4 seems 
to never be much faster, but there were multiple reports where it
was a lot slower (mostly those where gl2 was faster).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23898 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-28 22:54:08 +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
henry 0f85b371fd set the window aspect hint 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23525 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-09 09:25:41 +00:00
diego 5edd9af248 Remove some unused variables, patch by timwoj ieee org. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-28 08:42:35 +00:00
reimar e9d5b5de07 Do not set VFCAP_EOSD_UNSCALED if we use scaled-osd 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23153 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-27 16:10:45 +00:00
eugeni c67220c86f Add -ass-hinting option for setting font hinting method. 
It is possible to separately configure hinting for scaled and unscaled osd.
The default is native hinter for unscaled osd (only vo_gl at this point),
no hinting for vf_ass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23152 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-04-27 14:25:36 +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 c9c2f7332e Add a new GPU-based scaling method to vo gl 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22507 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-11 14:59:08 +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
reimar 23f4a0d1e2 Avoid calling aspect on each frame and make ass subtitles work better with panscan 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22167 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-06 19:26:58 +00:00
reimar 60a5215eca Update gl:help output a bit 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22105 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-03 11:31:09 +00:00
reimar 29a164309f Fix compilation under MinGW with X11 enabled 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21647 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-17 12:33:09 +00:00
eugeni e15d11c89e Speed up ASS subtitles display by detecting changes between two consecutive 
rendering results.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21522 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-06 18:44:26 +00:00
reimar 3a5074f460 Fix single-black-pixel-in-upper-left-corner bug (how do people notice a single 
black pixel?? Amazing...).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20436 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-24 18:51:38 +00:00
reimar 84767439c9 EOSD performance debugging info. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20090 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-06 09:58:29 +00:00
reimar 953d001217 Whitespace-only cosmetics 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19945 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-09-22 20:26:12 +00:00
reimar 40dad6e266 Aggregate multiple small EOSD textures into one large since hundreds of 
texture creates are very slow.
Might cause artefacts with scaled OSD since large textures are not cleared each
time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19944 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-09-22 20:23:17 +00:00
reimar 7da0bb114d Cosmetics: move curtex++ out of for () into code body, needed for coming patch 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19943 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-09-22 20:19:51 +00:00
reimar 1014da2101 use eosdDispList != 0 to check if eosd should be drawn instead of eosdtexCnt > 0 
in preparation of upcoming patch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19942 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-09-22 20:16:36 +00:00
reimar 4e6749d0ef Make genEOSD behaviour with NULL data more explicit 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19941 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-09-22 20:13:21 +00:00
reimar 2dd3f3f55a Modify clearEOSD to make experimenting easier 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19940 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-09-22 19:58:43 +00:00
reimar 0c8fc56f34 remove useless zero-initialization code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19939 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-09-22 19:15:40 +00:00
reimar 6ec6374d6f Cosmetics: reindent, remove tabs and break overlong lines. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19586 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-28 20:38:31 +00:00
reimar 6fd61e1c4c Cosmetics: fix indentation after last patch 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19585 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-28 20:21:04 +00:00
reimar c92e065c1e Hardware EOSD (ass) support. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19584 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-28 20:17:42 +00:00
reimar c7d8e7abfa Disable Y800 colorspace support, otherwise mplayer uses it even when it's not supposed to. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19362 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-08 14:56:12 +00:00
reimar b46347bd28 vo_gl can do flipping without special filter 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19001 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-10 18:36:50 +00:00
reimar e473bae3df Fix negative stride handling in -dr case 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19000 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-10 18:35:29 +00:00
reimar a677c0b41f Get rid of left-over incorrect UnmapBuffer hack 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18999 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-10 18:33:34 +00:00
reimar 4bc8d91bc9 customtrect -vo gl suboption 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18968 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-08 19:29:04 +00:00
reimar d1cbef4d86 More helpful ProgramEnvParameters. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18965 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-08 19:22:36 +00:00
reimar 01d5289203 Improve windows gui support 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18954 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-08 15:00:37 +00:00
reimar f07aeccfc7 Do not assign same texture number to GL_TEXTURE_2D and GL_TEXTURE_RECT, 
this can also cause problems.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18901 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-04 16:31:45 +00:00
reynaldo 9d9a15d185 rm unnecesary casts from void* - part 2 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18883 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-02 03:59:36 +00:00
reimar efd13273f9 Get rid of unused variable 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18877 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-01 10:59:21 +00:00