github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-18 21:16:10 +01:00
Code Releases Activity
17,957 Commits 41 Branches 86 Tags 188 MiB
97600b8ee0
Commit Graph

117 Commits

Author SHA1 Message Date
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