RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 00:07:33 +00:00
Code Issues Releases Wiki Activity
31,409 Commits 43 Branches 87 Tags 170 MiB
b996250a2a
Commit Graph

80 Commits

Author SHA1 Message Date
Uoti Urpala
b390b9b28f Merge svn changes up to r30185 2010-01-08 01:36:05 +02:00
Uoti Urpala
231b33a02f Merge svn changes up to r30165 2010-01-08 01:05:30 +02: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
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
Uoti Urpala
dc7f183022 Merge svn changes up to r30104 
Ignore the broken correct-pts change in r30100.
 2009-12-30 00:14:20 +02:00
Uoti Urpala
67b40bd219 Merge svn changes up to r30065 2009-12-29 23:57:14 +02: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
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
Uoti Urpala
efcc9ad712 Merge svn changes up to r30055 2009-12-18 18:54:42 +02: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
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-13 02:58:57 +00:00
Uoti Urpala
1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02:00
diego
befc528297 Add standard license headers, unify header formatting. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-08 03:27:30 +00:00
Uoti Urpala
a3ab9e8e46 Merge svn changes up to r28149 2008-12-14 17:28:16 +02:00
reimar
39f24a83c7 100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28104 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-06 06:18:57 +00:00
Uoti Urpala
cb3dc68691 Merge svn changes up to r28103 2008-12-06 02:16:51 +02:00
reimar
b6e113841c Add experimental support for glXAllocateMemoryMESA 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28101 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-05 22:16:45 +00:00
reimar
0ca415447d Add support for YCBCR MESA texture format to vo_gl. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28093 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-05 15:36:54 +00:00
Uoti Urpala
e46ce9c0ac Merge svn changes up to r27899 2008-11-06 20:41:40 +02:00
reimar
14eb21fce0 For fragment programs, check GL_MAX_TEXTURE_IMAGE_UNITS instead of GL_MAX_TEXTURE_UNITS. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27899 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-06 18:39:37 +00:00
reimar
c9f2a3636c Change OpenGL support to work on unmodified MinGW64 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27879 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-02 16:37:45 +00:00
Uoti Urpala
ebb4abf208 Merge svn changes up to r27682 
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.

Conflicts:
	command.c
	mplayer.c
 2008-10-02 05:17:23 +03:00
reimar
0e99017da9 Change glCreateClearTex to use the same host data format as later uploads. 
This fixes at least some of the massive performance problems the ATI drivers have.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27653 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-20 17:48:01 +00:00
Uoti Urpala
3a69d65f8d Merge svn changes up to r27347 
Conflicts:

	libvo/x11_common.c
	libvo/x11_common.h

Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.
 2008-07-25 02:50:58 +03:00
reimar
983800b76f Enable runtime border/window decorations-toggling for Linux gl and gl2 vos. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27338 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-22 18:46:07 +00:00
Uoti Urpala
d5c868325c Merge svn changes up to r26979 
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
 2008-06-04 08:10:48 +03:00
reimar
6689fe364e Add a filter strength parameter for blurring/sharpening scalers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26868 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-24 11:19:38 +00:00
reimar
dbe3c2994a Forgotten changes to gl_common.h 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26867 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-24 11:04:18 +00:00
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
diego
37ea342f85 #include config.h before all other headers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26235 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-14 16:46:13 +00:00
diego
c5001347c2 This header uses parts of stdint.h, so #include it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26195 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-07 20:25:26 +00:00
diego
d04df10807 Add missing header #includes to fix 'make checkheaders'. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26194 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-07 20:07:15 +00:00
diego
8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-22 09:09:46 +00:00
reimar
6a6c3d8cbc Add a fragment program for 5x5 unsharp masking 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25786 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-18 19:05:29 +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
diego
fba0b66ff9 Add explanatory comments to the #endif part of multiple inclusion guards. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-31 16:15:50 +00:00
reimar
dc804a9536 Add a bicubic scaler that needs a lot more instruction but no 
extra texture lookup


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24338 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-04 10:46:31 +00:00
diego
3e9e4acd8d Do not use leading underscores in multiple inclusion guards, they are reserved. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-02 22:34:45 +00:00
reimar
d32650a87c forgotten lscale=2 part for gl_common.h 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22509 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-11 15:32:48 +00:00
reimar
4f6a65ef4e Avoid void * arithmetic 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21217 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-25 13:34:55 +00:00
reimar
e799a08925 Support for 16 bit ppms 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18966 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-08 19:23:26 +00:00
reimar
497b2f561e Add yuv to rgb conversion using a 3D lookup texture 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18656 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-08 19:02:56 +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
1b0b329dd7 Add bicubic texture scaling 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18623 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-07 14:07:32 +00:00