1
mirror of https://github.com/mpv-player/mpv synced 2024-11-03 03:19:24 +01:00
Commit Graph

362 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
reimar
2d065d1c6d signed division must be used for calculation vo_dx and vo_dy.
Fixes a bug that causes overbig windows to disappear on Windows.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17128 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 15:56:27 +00:00
reimar
cd8e16a22e Must use glFlush when doublebuffering is not used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17118 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 22:35:54 +00:00
reimar
6b9f08f720 Get rid of most #ifdefs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17117 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 22:23:06 +00:00
reimar
57bd6e2d5b Use slice-height 16 as default for yuv colorspaces (only relevant if decoder
does not support slice rendering).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17028 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-22 16:18:34 +00:00
reimar
28b32a786a Enable border toggling for gl and gl2 under windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17007 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-17 20:49:46 +00:00
reimar
99f1babca7 10l typo, nomanyfmts should be used against playback problems.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16881 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-31 13:57:37 +00:00
reimar
1b6809f326 More consistent and sane types. Also avoids some gcc 4 warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16880 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-31 13:56:16 +00:00
reimar
fc96ad08af Be less verbose.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16752 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 19:15:30 +00:00
reimar
1a3e0c3b12 documentation update.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16627 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-01 12:53:49 +00:00
reimar
7a3909684e fix/improve code doxumentation. Also group gl_common functions in several
doxygen modules


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16596 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:41:28 +00:00
reimar
e74494dd4d Allow specifying a custom (ppm) texture for texture unit 3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16594 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:31:58 +00:00
reimar
d16d2c3e32 Support rectangular texture in fragment programs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16587 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 16:07:54 +00:00
reimar
b008020536 Several bugfixes:
black OSD border with scaled-osd
draw only used parts of image (looks weird with equalizer controls otherwise)
clear borders when switching to fullscreen when using -nodouble


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16585 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-25 14:02:02 +00:00
reimar
4e60e039f5 hardware color-space conversion for vo_gl and vo_gl2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16489 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-14 22:08:04 +00:00
reimar
587c45e08e Improved glFindFormat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16475 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-13 15:56:32 +00:00
reimar
4de258aac4 Respect -nodouble even though it looks very bad.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16459 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-11 17:45:12 +00:00
reimar
904448cec5 Add missing doxygen comment for clearOSD()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16437 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-09 16:43:18 +00:00
reimar
be2b214c35 gl_buffer should be unsigned
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16435 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-09 14:49:13 +00:00
reimar
bb0c8b3df5 Add an uninit function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16434 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-09 14:47:54 +00:00
reimar
6220c8e924 Properly initialize osdtexCnt
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16398 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-05 10:08:04 +00:00
reimar
3561e3a980 OSD alpha conversion index out of range
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16397 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-05 10:02:06 +00:00
reimar
f68be97419 Fix texture format variable types. Internal format is GLint, others are GLenum
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16304 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-25 12:45:57 +00:00
reimar
6f4bba6b61 -wid support for windows. Not well tested, might still behave a bit weird.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16283 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-21 09:59:45 +00:00
reimar
77ec0f850d less weird OSD alpha transformation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16273 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-19 12:23:34 +00:00
reimar
f37f504f2a Do not set SwapInterval for values < 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16272 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-19 12:16:52 +00:00
reimar
0a19444796 automatic vsync enabling for vo_gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16269 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-19 09:31:02 +00:00
reimar
cbd8483a32 Get events from -wid window.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16240 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 23:24:52 +00:00
reimar
c157ebb6c9 Our buffer usage actually fits better to GL_DYNAMIC_DRAW than GL_STREAM_DRAW.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16238 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 19:07:07 +00:00
reimar
dfa61db50a OSD textures can be deleted with one function call...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16237 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 18:52:38 +00:00
reimar
7e6c29c530 Make glFinish optional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16236 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 18:27:12 +00:00
reimar
44ec3f7566 use GenBuffers to get a buffer number instead of hardcoding 1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16234 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-16 17:57:53 +00:00
reimar
c7888c0a7f remove/move some unused headers/variables/code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16222 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 19:24:49 +00:00
reimar
698494f779 Helper function for drawing texture and general cleanup of vo_gl2.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16215 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-14 13:44:14 +00:00
ivo
cd55954e4e Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
return values can be negative (VO_ERROR, VO_NOTAVAIL and VO_NOTIMPL), so it's
changed to int now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16172 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 01:24:37 +00:00
reimar
f467c97576 More helper functions/defines and bugfixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16118 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-27 17:22:24 +00:00
reimar
775c4db7f4 catch failed buffer allocation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16114 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-26 20:36:34 +00:00
reimar
1feebc74c7 OpenGL fixes for windows and vo_gl.c ported to windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16110 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-26 13:47:18 +00:00
reimar
c30b5e70b7 support for rectangular and streaming textures.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16100 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-26 10:16:18 +00:00
reimar
6acf6c886e Use DRAW_IMAGE instead of draw_frame
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16093 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-25 19:11:14 +00:00
reimar
de6925b979 Enable manyfmts by default for vo_gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-19 08:42:55 +00:00
reimar
fd0aa2708e support -wid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15749 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-18 18:32:29 +00:00
reimar
1c0928d65e Fix OSD handling, DVD subtitles work now. Will be a bit slower though.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15720 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-13 20:09:05 +00:00
reimar
881f0f083f -geometry support for gl2 under win, default window pos centered for gl, gl2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15596 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-30 08:45:21 +00:00
reimar
7322c396a9 Implement -geometry for vo gl and gl2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15590 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-29 17:04:51 +00:00
henry
dbb001bae2 replace VO and VF numeric flags with #defined identifiers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15213 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-18 15:52:38 +00:00
henry
e68fc0c46a revert the previous commit, gl needs to reload the font immediately
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15087 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-10 13:12:55 +00:00
henry
d84d885309 remove force_load_font stuff moved to sub.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15081 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-09 22:45:47 +00:00
reimar
cdfb0214ba Remove a lot of duplicate code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14748 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-21 14:44:39 +00:00
al
546e6316ac Move generic tests to a common place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14737 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-19 20:14:00 +00:00
reimar
2ac89bd388 set sub_bg_alpha only to 255 when using hardware OSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14431 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-08 17:58:56 +00:00
reimar
efa1ae2274 Use subopt helper to parse arguments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14287 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-31 14:58:49 +00:00
reimar
f9258247dd Doxygen comments improved
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14270 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-29 14:33:40 +00:00
reimar
c977dab456 More similar code from gl and gl2 moved to gl_common
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14079 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-01 17:05:58 +00:00
reimar
6a197759bd 4 and 8 bit formats use a palette, so we cannot really support them (atm).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13994 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-20 10:57:39 +00:00
reimar
60fae69741 missing return for InitGl function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13921 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-11 19:39:23 +00:00
reimar
a594c4f593 more fullscreen fixes and gl2 uses setGlWindow.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13872 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-04 18:31:55 +00:00
reimar
1a7a3f8b38 fullscreen fixes and GUI support for vo_gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13844 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-01 20:24:37 +00:00
reimar
69a5c44698 OSD variant for vo_gl.c that behaves more like the one of other vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13661 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-17 19:32:47 +00:00
reimar
0164758aa8 added gl_common for code used by both vo_gl.c and vo_gl2.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13654 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-17 13:28:22 +00:00
reimar
a89dbc8ecd aspect scaling and panscan support for vo_gl.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13602 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-10 14:05:29 +00:00
reimar
780e75dd68 Variables for OSD support should be static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13600 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-10 12:26:58 +00:00
reimar
274c433f07 OpenGL OSD rendering for vo_gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13586 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-08 19:53:11 +00:00
reimar
fb4299aa23 10l compilation fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13577 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-06 19:53:16 +00:00
reimar
4131acb7ff fixed UNPACK_ALIGNMENT setting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13576 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-06 16:48:19 +00:00
reimar
0a2999f9f4 improved suboption parsing, fixes also compiler warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13238 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-03 12:12:17 +00:00
reimar
ef6466d9ad Using updated colorspace specifications from colorspaces.txt.
All by manyfmts suboption supported formats should display correctly now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13207 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-30 21:06:52 +00:00
rathann
d9a5e00183 small gcc warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13189 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-28 20:59:49 +00:00
reimar
d7d2ea1551 removed saver_on, saver_off calls, they are already in x11_common.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12896 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-25 12:49:01 +00:00
reimar
4eebc5af53 changed misleading TEXTUREFORMAT_32BPP (was 24bpp!) to vo_gl2 style TEXTUREFORMAT_ALWAYS
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12844 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-17 14:32:22 +00:00
reimar
7eb4b975ed removed XFlush() before XSync()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12750 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-02 16:16:46 +00:00
reimar
ca4e501dc0 changes to get manyfmts nearer to working and fixed memory leak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12446 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-08 21:38:41 +00:00
reimar
d81b02cce8 fixed suboption parsing, added help for suboptions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12213 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-15 18:19:39 +00:00
reimar
02fa83290a vo_gl supporting more color formats for testing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12160 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-08 21:50:29 +00:00
attila
d592bf3e6a printf -> mp_msg
patch by Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11989 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-22 15:30:01 +00:00
joey
640f93d018 runtime 'stay-on-top' functionality
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11543 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-30 16:36:10 +00:00
faust3
a9faa87694 fix fullscreen switching in vo gl and vo gl2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10920 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-21 15:44:23 +00:00
mosu
908e6a761d Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10758 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-31 22:27:10 +00:00
alex
6a8d08a063 Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10139 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-20 16:48:05 +00:00
arpi
ac3b6c6552 - optional slice height for -vo gl (example: -vo gl:32)
based on patch by Dmitry Baryshkov <lumag@qnc.ru>
- default height changed from 1 to 4, seems to be more optimal and works
fast on both g400max & gf4ti4200


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8655 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-30 01:34:20 +00:00
alex
6811f96358 removed get_info, using the same sheme as in libmpcodecs instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8149 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-11 15:22:10 +00:00
arpi
889ffa50ea vo_init() moved to/fixed in preinit()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7932 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-27 03:16:21 +00:00
pontscho
7eadbc8831 -fixed-vo support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7778 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-17 09:49:25 +00:00
alex
64bedd9683 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7125 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 21:32:32 +00:00
alex
0b03ca9d27 removed old input code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7112 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 15:55:58 +00:00
arpi
1d17fa69c3 ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
patch Kazunori Ueno <jagarl@creator.club.ne.jp>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6954 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-09 17:43:49 +00:00
alex
bb314fce93 query_format revised
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6213 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-27 17:56:52 +00:00
arpi
e6bcec1c6b some cleanup, gl/gl2 updated to use vo_window
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6096 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-14 23:44:35 +00:00
pontscho
da6135b983 fix playlist bug with gui and rewrite mousecursor show/hide code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5652 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-16 17:41:29 +00:00
nick
5ddd8e92a1 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4738 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-17 08:24:43 +00:00
albeu
30c218a61b Added new input mouse support in x11 vo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4659 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-11 11:44:50 +00:00
arpi
4b33dccb25 10000hl to Holm... control MUST BE static...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4597 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-09 01:21:48 +00:00
arpi
7c51652a1b query_ stuff replaced by new control() - patch by David Holm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4593 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-09 00:47:26 +00:00
rfelker
8b91d86c30 change init to config in vo_gl and vo_md5 like in the other vo_ modules -- fixes crash caused by the changeover
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4449 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-01 02:49:04 +00:00
alex
947903ce8d removed obsoleted Terminate_Display_Process, using vo_x11_uninit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4441 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-31 11:46:46 +00:00
nick
b587a3d642 new info for tuning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4434 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-31 09:57:13 +00:00
nick
fa1d5742bc Extensions for video accelerated architecture
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4353 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-26 16:01:26 +00:00
atmos4
eb2c656b52 Xinerama patch number two by attila.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4018 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-06 21:07:20 +00:00
nick
dfe91abaa2 Move yuv2rgb to postprocess
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2733 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-11-06 11:22:40 +00:00
atmos4
14fe0175c0 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2250 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-18 02:42:20 +00:00
atmos4
ee2e0f2bdd Use aspect()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2058 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-03 17:27:13 +00:00
arpi
e1622e70c8 now using x11_common stuff for X11 opening and w/h/bpp query
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2042 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-01 22:38:16 +00:00
atmos4
18c3d56469 -fs fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2041 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-01 20:56:19 +00:00
atlka
ca99c8dc89 changes according to -utf8 option, draw_osd() function added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1502 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-13 11:08:18 +00:00
atmos4
6e0c3925d7 Fixed a typo and wrong varname.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1303 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-07-10 13:24:59 +00:00
alex
c4c7864848 no segfault if no glx present
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1291 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-07-07 20:53:01 +00:00
arpi_esp
9e90ab5430 patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1138 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-06-17 01:22:09 +00:00
al3x
790fa570cf -Wall like fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1110 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-06-12 14:03:18 +00:00
szabii
eb30258d07 fprintf(stderr converted to printf(
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@615 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-04-24 11:30:57 +00:00
szabii
cd30d641c1 some warnings killed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@613 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-04-24 10:21:12 +00:00
lgb
8b84635c64 Autohide X11 cursor
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@385 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-04-13 00:54:05 +00:00
arpi_esp
0661c59b20 added check_events() interface
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-03-03 21:46:39 +00:00
arpi_esp
d34041569e Initial revision
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-02-24 20:28:24 +00:00