1
mirror of https://github.com/mpv-player/mpv synced 2025-01-20 21:07:29 +01:00
Commit Graph

28519 Commits

Author SHA1 Message Date
Uoti Urpala
5204fda121 vo_xv: Always support updating OSD if none was drawn yet
If the main image buffer was not altered for OSD then allow updating
OSD even if no separate OSD-less copy was made. The code now makes a
copy at that time (another possibility would be to not make a copy and
disallow further updates).
2008-12-10 19:53:32 +02:00
reimar
b291f84901 Add support for writing PNG files with alpha channel in -vo png
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28126 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-10 16:44:12 +00:00
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
gpoirier
8e8b7921af 10l: actually disable quartz vo when detection failed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28124 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-10 14:28:17 +00:00
compn
b970a125a5 add acdv fourcc to ffmjpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28123 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-10 12:41:36 +00:00
Uoti Urpala
f01f7f6259 ao_alsa: Sanity check get_space() return values better
Sometimes after seek audio reset I see snd_pcm_status_get_avail()
return huge values. get_space() already had a check againt the value
being larger than the whole buffer; however since the unsigned value
from the ALSA function had been cast to signed by that point it was
interpreted as negative and the check didn't trigger. Use unsigned
instead to make the check reliable and ensure the return value is sane.
2008-12-10 02:54:01 +02: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
compn
5f3a152314 add binary voxware metavoice audio codec, format 0x74
works on http://www.hfhrpol.waw.pl/Tybet/multimedia/MaoMacha.asx


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28117 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 02:46:28 +00:00
Uoti Urpala
02efad79a2 Update OSD while paused
When OSD contents change while paused, try to change the OSD drawn in
the currently visible frame. If such OSD updates are not supported
then advance by one frame and draw the OSD normally. Add some support
for OSD redrawing to vo xv.

The new xv code makes a copy of the original frame contents before
drawing the OSD if MPlayer is already paused when the frame is drawn.
If such a copy of the current frame exists then the frame contents can
be restored and a different OSD drawn on top of the same frame.
2008-12-09 04:31:07 +02:00
Uoti Urpala
95f35c4d20 vo_xv: Reformat code
Reformat vo_xv.c completely to K & R style and remove a couple of
outdated comments.
2008-12-09 04:31:07 +02:00
Uoti Urpala
6fec7ec734 Allow seeking while paused
Screen is now updated immediately (doesn't always work without
correct-pts yet though). Doing audio unpause after the seek reset can
display errors.

Main loop code now checks for possible reasons to stop command
processing instead of relying on each command to also set an explicit
'break' flag.
2008-12-09 04:31:07 +02:00
Uoti Urpala
77c709ad31 Start pause handling changes
Add separate pause_player() / unpause_player functions(), move some
pausing-related state into explicit variables and make commands while
paused not unpause. Not everything works properly while paused yet (no
screen updates etc).
2008-12-09 04:31:07 +02:00
Uoti Urpala
6fa90873cc configure: Update required x264 version
configure accepted old versions which then caused a build failure
later. Update required version number from 59 to 65.
2008-12-09 04:28:17 +02:00
Uoti Urpala
e948b1ae06 Work around vo gl/libass subtitle timing problem
vo gl generates bitmaps for EOSD content (libass subtitles) when
DRAW_EOSD is called but actual drawing of both EOSD and OSD is done in
draw_osd(). Since draw_osd() was called first it drew the EOSD content
from the previous frame, so the subtitles were always one frame late.
As a simple workaround update EOSD content first, then normal OSD.
This makes vo gl work correctly and should have no effect on anything
else.
2008-12-09 04:14:38 +02:00
Uoti Urpala
66cefd5f71 ao_alsa: If pause loses samples replace them with silence
If the ALSA pause functionality is not available the driver has to
drop buffered samples when MPlayer calls pause(). Replace them by
playing a corresponding amount of silence in resume() instead of
shortening the overall audio duration.
2008-12-08 22:36:06 +02:00
compn
6d700fd4e2 remove duplicated fourcc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28116 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 19:43:48 +00:00
compn
b82b482c2a add some fourcc's and ulead dv audio codec, fixes samples from:
http://home.twmi.rr.com/compn//uncommon_audio_codecs.txt


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28115 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 19:42:00 +00:00
reimar
ae49e3a514 Use svn.ffmpeg.org for the externals which is both more correct and more reliable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28114 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 14:43:28 +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
Uoti Urpala
bc4c570ab1 Makefile: prevent default build rules being used on FFmpeg files
After adding .o files to the dependencies of FFmpeg .a files make
tried to build those .o files with default rules before recursing to
the FFmpeg subdirs. Fix this by adding a dummy rule. Also fix
incorrectly placed parentheses in the command creating the FFMPEGFILES
list. That resulted in some files being listed multiple times,
triggering warnings from the dummy rule.
2008-12-06 06:21:53 +02:00
Uoti Urpala
a36945fe44 Makefile: Rebuild FFmpeg libraries when .asm and .o files change
There was a missing dependency that meant FFmpeg libraries were not
recursed if only .asm files changed. Also add a dependency on .o files
to update the corresponding .a (though this case should only happen if
you run compilation commands manually).
2008-12-06 05:33:33 +02:00
Uoti Urpala
2a6178e5ab Makefile, common.mak: Create .d files when creating corresponding .o
The separate .d file creation logic has caused various problems, most
notably cases where 'make' exits without doing anybut but without
giving any error either. Change the Makefile so that .d files are
always created or updated when the corresponding .o file is. This
avoids the problems of current .d file generation and still gives
correct dependencies.

The common.mak change does the same for the libswscale build. However
it does not affect the directories under ffmpeg/ because those use
ffmpeg/common.mak. The MPlayer common.mak can be copied over the
ffmpeg/common.mak file to make the fix apply to the FFmpeg directories
too. This is not done automatically because the FFmpeg file is under
version control and changing it could cause problems.
2008-12-06 05:33:33 +02:00
Uoti Urpala
b37a869f13 Makefile: Don't use "install -d" on existing directories
Makefile used "install -d" on directories like "/usr/local/bin".
Because the install program always tries to set permissions this
command causes an installation failure if the directory exists and is
writable but you cannot change its permissions (default configuration
for group staff on Debian for example). So avoid running such commands
on existing directories.
2008-12-06 05:33:32 +02:00
Uoti Urpala
cb3dc68691 Merge svn changes up to r28103 2008-12-06 02:16:51 +02: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
gpoirier
72200eda4e sync w/r28096
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28100 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 21:46:28 +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
d8185b1040 Using rectangle=2 for vo_gl is probably a good idea nowadays.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28096 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 15:55:25 +00:00
reimar
c6f6d46ace Document missing vo_gl suboptions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28095 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 15:54:31 +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
compn
403cf73c97 add a bunch of binary codecs with samples from this list:
http://home.twmi.rr.com/compn/uncommon_video_codecs_final.txt
change sif1 codec to vfw since the dshow codec was terrible
mark videocodec alaris as working


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28092 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 14:50:48 +00:00
reimar
fa7614e9aa Add const to avoid warnings about discarded qualifiers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28091 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 14:21:22 +00:00