Commit Graph

3078 Commits

Author SHA1 Message Date
diego 620ab70745 Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30208 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 19:04:33 +00:00
diego ebe9682831 Remove unused variable; fixes the warning:
libvo/csputils.c:67: warning: unused variable 'yuv_tv_level_adjust'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30206 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 15:14:21 +00:00
diego 4ae9751ee6 Add missing license headers for vo_matrixview code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30203 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 13:05:52 +00:00
diego 55c7b19ae1 Refer to MatrixView instead of MPlayer in code taken from MatrixView.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30202 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 13:05:05 +00:00
reimar 36e760f9d9 Remove ARGB support from matrixview vo, it is quite pointless and causes
compilation failure on big-endian.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30198 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 11:58:56 +00:00
diego eb6fc7e99e prettyprinting cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30195 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 10:24:10 +00:00
reimar fb26608318 Make vo gl print the OpenGL vendor and version strings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30193 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 18:44:56 +00:00
reimar ef395a2f08 Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30192 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 17:12:12 +00:00
reimar 3b34c55178 Avoid memleaks when vo_direct3d initialization fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30191 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 17:04:04 +00:00
reimar f31ed10742 Modify -vo direct3d so we do not have to link against d3d9.dll, it might
not be available on some rare systems.
Based on patch used for builds by Gianluigi Tiesi [sherpya netfarm it]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30190 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 17:00:51 +00:00
reimar eff2254d58 Change vo_png to use FFmpeg's png encoder instead of libpng.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30186 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 16:26:30 +00:00
reimar a7be2e180b Finally add matrixview vo.
Heavily cleaned up/fixed etc. by me, improvements are still possible though.
Patch originally by Pigeon <pigeon at pigeond.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30182 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:54:51 +00:00
reimar f06aa83a83 Add pointers to a few more standard OpenGL functions to ease future extensions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30179 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 12:55:09 +00:00
reimar c23a01e260 Fixup SDL configure check:
- Make it work without sdl-config which adds at least useless or even hurtful
  cflags and also does not work for cross-compiling
- If using sdl-config, make it use the CFLAGS we actually use for compiling
  instead of something else. Thus #undef main is needed in the test program.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 11:33:33 +00:00
reimar 485b17cc7d Do not assume that "long" is the size of a register.
Fixes aclib compilation on mingw64 (with --enable-runtime-cpudetection).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30177 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 09:20:01 +00:00
reimar 92cd6dc3e9 Simplify range-checking functions for subopt parsing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30165 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 13:23:16 +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 5f684e1b32 Slightly generalize code to generate YUV->RGB conversion table and add
XYZ->RGB conversion as an example for that.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30163 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 12:54:09 +00:00
reimar 6450271656 Make YUV->RGB conversion coefficients selectable for -vo gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30161 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 12:47:43 +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 0ecf324ac5 Extract functions to generate yuv->rgb matrices and lookup tables into a
separate file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 18:25:35 +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 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