Commit Graph

162 Commits

Author SHA1 Message Date
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
reimar 0da07e3724 Make sure all texture units have a different texture bound.
Should fix weird behaviour with e.g. yuv=4:lscale=1


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18876 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-01 10:58:32 +00:00
reimar db92e7a6b7 remove pointless and sometimes incorrect lookupTex stuff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18791 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-22 17:05:08 +00:00
reimar 580302e179 Reduce number of OpenGL state changes when drawing OSD by first drawing alpha.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18722 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-15 08:43:41 +00:00
reimar 2741e50f20 Document lscale/cscale in -vo gl:help message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18698 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-13 20:30:16 +00:00
reimar 2a61cc675b loadGPUProgram function to load fragment program with error checking and statistics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18654 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-08 18:50:11 +00:00
reimar 0965bcee43 Reworked YUV2RGB fragment program setup in preparation for upcoming patches
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-07 13:24:54 +00:00
reimar fbae2ba72b Move/add checks to avoid crashes and make error messages less confusing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18580 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-05 11:45:33 +00:00
reimar 7f3d9de556 Fix and improve xinerama support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18117 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-16 13:38:28 +00:00
reimar d96b09cd64 fixes and cleanup for windows fullscreen switching (restore old position,
fullscreen on current monitor).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18080 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-12 14:11:26 +00:00
reimar 97600b8ee0 support custom OSD colour for vo_gl.c. Based on patch by Tomas Janousek tomi at nomi cz
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17957 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-26 10:43:56 +00:00
reimar 33f64f9e05 extra checks on size of OSD parts (though IMHO these values should never be bad)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17876 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-15 21:13:13 +00:00
reimar cf1e2325c3 do not call glDeleteTextures with 0 count, Xgl does not like it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17872 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-15 12:15:35 +00:00
rathann e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
reimar 2a15e8beb8 support negative stride (flipping) in vo_gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17221 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-18 12:04:08 +00:00