1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 12:55:16 +00:00
Commit Graph

2762 Commits

Author SHA1 Message Date
reimar
9c0caf340f Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28125 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-10 16:39:45 +00:00
diego
57f19d3935 Fix MGSTR vs. MSGTR typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28122 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 20:25:49 +00:00
reimar
98d227c9fd Set d3d_handle to NULL after release.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28121 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:44:48 +00:00
reimar
d0952d0b19 Forgotten part of previous cosmetics commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28120 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:41:41 +00:00
reimar
6f621f00d8 Slightly simplify the conditional release/free code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28119 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:36:15 +00:00
reimar
1dd432665e First version of OSD support for vo_direct3d
Patch by Jim Hauxwell [james dattrax co uk] with modifications by me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28118 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:31:52 +00:00
diego
a9c80bee77 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28113 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 11:30:43 +00:00
reimar
38005bd941 Remove pointless or even wrong N/A return values doxy comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28112 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 11:04:27 +00:00
diego
9bdda2ec49 Add missing unistd.h #include, fixes the warning:
libvo/vo_macosx.m:177: warning: implicit declaration of function 'ftruncate'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28111 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 00:12:53 +00:00
diego
4c7dc59a04 Remove unused variable, fixes the warning:
libvo/vo_macosx.m:735: warning: unused variable 'lastTime'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28110 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 00:11:03 +00:00
diego
1f5caf1867 #include appropriate headers instead of locally declaring function prototypes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28109 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 00:02:07 +00:00
reimar
d761fd207a ati_hack only makes sense when PBOs are used, not with mesa_buffer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28108 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-06 12:13:14 +00:00
reimar
e70a7dde5e More possible fixes for mesa-buffer mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28107 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-06 06:44:54 +00:00
reimar
5daa1bf60f Move one ati_hack check to a better place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28106 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-06 06:41:36 +00:00
reimar
66fc5a8ffb Reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28105 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-06 06:40:47 +00: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
reimar
c6ef662318 10l, add forgotten a #ifndef GL_WIN32, fixes win32 builds.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28103 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 23:35:32 +00:00
reimar
a86076ac44 Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28102 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 22:35:24 +00: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
7fd346bc71 Avoid one more duplicated logic.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28099 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 20:56:49 +00:00
reimar
e7d53f6d86 Simplify, do not duplicate buffer size calculation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28098 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 20:50:43 +00:00
reimar
476c9bfd95 Set the base size window manager hint, otherwise some subtract the minimum
size of 4x4 from the numbers displayed to the user which might be confusing.
Based on patch by Bert Wesarg [bert wesarg googlemail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28097 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 19:01:49 +00:00
reimar
173e7ebc35 Add some forgotten documentation for gl suboptions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28094 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 15:50:24 +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
diego
0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
diego
fda888c61c Remove unused declarations and references to vo_draw_text_osd(),
vo_draw_text_progbar(), vo_draw_text_sub().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28083 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 18:53:35 +00:00
reimar
2b12cb43f1 Fix indentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28076 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 12:22:32 +00:00
reimar
70dbf549e6 More robust w32 -wid size handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28074 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 10:54:01 +00:00
reimar
23a8967a4c Reindent after previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28073 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 10:42:53 +00:00
reimar
c4386a8333 Do not override the vo_dwidth/vo_dheight values in vo_w32_config
in -wid mode because we ignore the requested size in that case. 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28072 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 10:38:50 +00:00
reimar
a3e78418b9 Cosmetics, whitespace and "... == NULL" to "!..."
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28070 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 09:58:11 +00:00
reimar
7ba61c19c3 Some whitespace and () cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28069 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 09:27:19 +00:00
reimar
27b167bb75 Remove resize_d3d call from render_d3d_frame that was made useless
by previous commit. If this is necessary e.g. to prevent flicker
while resizing, check_events should be called instead or even
better the functionality be moved to some higher layer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28065 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 15:03:19 +00:00
reimar
bb89a7696d 100l, do not call check_events from resize_d3d since there should be
no reason to do it and it might call resize_d3d again which makes it
hard to guarantee that it works correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28064 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 14:51:46 +00:00
reimar
2d330d3c01 Cosmetics: Remove unnecessary ()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28063 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:46:08 +00:00
reimar
ef4313fd77 Consistency cosmetics: do not compare against NULL in ifs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28062 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:40:09 +00:00
reimar
e84d33f00f Cosmetics: remove spaces before argument (
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:38:24 +00:00
reimar
bbc8a57160 Reorganize Direct3D initialization code.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28060 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:36:47 +00:00
reimar
5a0c4f3b61 Remove a lot of completely pointless mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28055 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-01 16:37:06 +00:00
nplourde
7baeb6bcfc use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
Original thread:
date: Sun, Oct 12, 2008 at 10:32 PM
subject: [MPlayer-dev-eng] [PATCH] vo_macosx: use mmap instead of shmat for MPlayerOSX


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28050 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-30 12:55:11 +00:00
diego
5e2bec3344 whitespace cosmetics: prettyprinting and indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28045 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-28 09:24:20 +00:00
gpoirier
cfedb9374f factorize mouse hiding and screensaver disabling code
Based on the patch posted in thread:
from  Gregor Riepl %onitake A gmail P com%
date: Wed, Oct 29, 2008 at 7:26 PM
subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28044 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-27 11:34:26 +00:00
reimar
669b0697b0 Use D3DFMT_ constants where possible instead of MAKEFOURCC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28041 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-26 16:30:42 +00:00
reimar
513bd7461d Add support for RGB formats to vo_direct3d
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28040 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-26 16:27:39 +00:00
reimar
16a685b00c 100l, OSD alpha textures were cleared to the wrong value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28036 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-25 18:24:23 +00:00
gpoirier
a5581ec3b8 typo fix + readability improvement
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28035 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-25 09:54:34 +00:00
diego
9051c1348d Remove unnecessary #ifdef around a struct and a bunch of extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28031 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 17:35:08 +00:00
diego
c27cdb7288 Do not initialize fb_dev_fd to -1, similar to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28028 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:44:09 +00:00
diego
1add1d6597 cosmetics: Add/remove a few newlines similar to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28027 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:35:08 +00:00
gpoirier
76797a077c cosmetics (svn diff --diff-cmd diff -x '-duwbBE' gives no differences)
replace tabs by 4 spaces.
prettier intentation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28026 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:29:32 +00:00