1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-24 17:06:58 +00:00
Commit Graph

3056 Commits

Author SHA1 Message Date
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
51e55db62e Move do_render_osd function to avoid a forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30126 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:31:13 +00:00
reimar
a5ee26b559 vo_x11_classhint name argument should be const, since we pass string constants there.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30125 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:19:48 +00:00
reimar
6023874828 Some ugly hacks to make compiling against a newer external version of libass work.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 10:51:24 +00:00
reimar
2908957147 Remove more direct includes of libass/ass.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30105 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 10:26:29 +00: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
81783bceed Slightly improve vo_gl suboption documentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30075 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 21:08:14 +00:00
reimar
763402d423 Define GL_GENERATE_MIPMAP ourselves if necessary.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30074 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 21:07:42 +00:00
reimar
300d40bed3 Add support for auto-generating mipmaps in vo_gl, should ease
implementing anything that needs blur filters with large support.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30072 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 20:53:34 +00:00
reimar
5dc258f4e8 Make -vo gl:customprog also work with RGB input (obviously those need to be
special RGB fragment programs).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30071 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 20:48:23 +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
cehoyos
e3b42e3e96 Cosmetics: Reindent after r30050.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30051 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-17 13:27:15 +00:00
cehoyos
3303bb67ec Slightly increase hardware decoding performance by always using more
video surfaces than absolutely necessary.

I will revert if somebody reports real-world resource issues introduced
by this commit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30050 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-17 13:23:15 +00:00
adrian
d8fed1f04c Cosmetics: reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30049 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-17 10:57:40 +00:00
cehoyos
9182f6a97c Improve VDPAU render performance by increasing number of output surfaces.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30048 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-17 02:16:12 +00:00
adrian
1078baf9aa The fontconfig check added in r30044 wasn't safe. This makes it more robust.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30046 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-16 22:36:17 +00:00
adrian
067b817500 Fix a crash when fontconfig is unable to select a font. e.g. if no config directory could be found.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30044 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-16 11:11:31 +00:00
adrian
2a33cd01f6 Add support for -geometry to corevideo.
Based on a patch by Tim Wojtulewicz (timwoj at ieee dot org).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30043 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-15 20:38:54 +00:00
adrian
5f0b5dcaa9 Add -xineramascreen support to corevideo vo. Still prefer corevideo's own device_id parameter if it's set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30042 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-15 20:25:50 +00: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
reimar
b379d40d90 100l, forgot to apply vo_w32_get_dc/vo_w32_release_dc declarations in w32_common.h
Should fix compilation on MinGW.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29960 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-22 14:46:43 +00:00
reimar
1bd34477aa Print which visual glXChooseVisual chose when running in verbose mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29948 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-21 22:32:53 +00:00
reimar
c045f6525f Move OpenGL-related messages that have large output from MSGL_V to MSGL_DGB2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29947 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-21 22:30:33 +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
597c92ff7f Support RGB48NE format in OpenGL vos (only really useful once they are modified
to actually use GLX/WGL visuals with more than 8 bits per component if available).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29944 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-21 18:59:52 +00:00
reimar
bd5ec5065e Use calloc to allocate a rather large (currently 32k) array instead of
putting it on the stack, performance should not matter much here.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29938 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-20 23:36:16 +00:00
ptt
ab4bdb64e1 Added -name, -title and -use-filename-title options and implementation in X11 vos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29904 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-12 09:21:53 +00:00
cehoyos
153cac185c Do not dynamically load libvdpau.so.1, but link at compile time.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29903 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 22:26:38 +00:00
cehoyos
2b93a48ac8 Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capable
hardware.

Original patch by NVIDIA corporation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29885 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 19:11:13 +00:00
cehoyos
78290719a6 100: Fix function parameters when calling create_vdp_decoder() from query_format().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29872 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 10:40:34 +00:00
cehoyos
88d80c2361 Cosmetics: Fix indentation after last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29871 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 10:05:10 +00:00
cehoyos
3865c166c9 Fail in query_format() if a VDPAU decoder is not available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29870 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 10:04:32 +00:00
cehoyos
7c774fd5ce Add a default to switch(image_format), suppresses a warning after a future patch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29869 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 09:52:43 +00:00
reimar
4b55351e28 Fix compilation of teletext code without freetype support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29864 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 15:17:06 +00:00
reimar
509475ec2c Change type of teletext color specification from unsigned char
to static const uint8_t


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29863 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 15:11:54 +00:00
cehoyos
2a5611473c Remove CONFIG_TV_TELETEXT.
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 16:40:42 +00:00
cehoyos
a10b3f08bf Add new VDPAU feature high-quality-scaling (and require newer library).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29823 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-04 15:30:13 +00:00
reynaldo
11cc4bcadb Remove unneeded initialization
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29818 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-03 20:46:54 +00:00
corey
0746f99a0a Slightly change behavior of "none" if fstype specification.
In a list of enabled fstypes, "none" now clears the list rather than
disabling all fstypes and interrupting the parser. To enable only one
(or more) fstypes, list the types to enable after "none".

For example:
"-fstype none" is the same as before: all disabled
"-fstype none,fullscreen" enables only the fullscreen type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29805 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-30 22:18:29 +00:00
cehoyos
a9474b0b39 Move teletext specific code from stream into libmpcodecs.
Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-29 22:13:04 +00:00
cehoyos
7800998a95 Cosmetics: Reindent after last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29799 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-27 08:29:07 +00:00
cehoyos
29c937fe80 Allow image format BGRA when using vo vdpau.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29798 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-27 08:28:08 +00:00
diego
3d264d7b55 Move some variable initializations to the beginning of vo_x11_fullscreen().
Fixes the warnings:
libvo/x11_common.c:1344: warning: 'h' may be used uninitialized in this function
libvo/x11_common.c:1344: warning: 'w' may be used uninitialized in this function
libvo/x11_common.c:1344: warning: 'y' may be used uninitialized in this function
libvo/x11_common.c:1344: warning: 'x' may be used uninitialized in this function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29795 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-24 12:35:18 +00:00