1
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 01:36:25 +01:00
Commit Graph

28519 Commits

Author SHA1 Message Date
Uoti Urpala
9bcd12fdf5 Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02:00
Uoti Urpala
e0d66b140e Revert OSD flicker fixes done better in another branch
Revert three commits from svn before merging other svn changes to
another branch. That branch has better fixes for these issues and the
commits would only cause conflicts.

The reverted commits are:
"Avoid flickering OSD with -vf yadif=1"
commit 5904de25e3

"Fix OSD flicker with tfields as well."
commit 8385fa3dc6

"Fix OSD flickering with filters that add frames (tfields, yadif) and"
commit 17ea23ac74
2009-01-15 04:45:22 +02:00
Uoti Urpala
d419ecd161 OSD: Ensure that OSD content is drawn in filter-added frames
Move the OSD drawing calls from filter_video() to higher-level code to
ensure that VOs will draw the OSD also in filter-added frames, which
are displayed without a separate call to filter_video().
2009-01-15 01:09:21 +02:00
Uoti Urpala
2d532689fc core: Improve handling of bad timestamps
Rewrite some of the -correct-pts frame generation code. The most
noticeable difference is that video timestamps which jump around but
do not go backwards more than 0.5 seconds will not affect overall
video playback speed. Only larger jumps are treated as timestamp
resets and increase the overall length of the video timeline. This
will hopefully give watchable results for videos which have broken
timestamps or which MPlayer does not demux or otherwise handle
properly.
2009-01-15 00:32:03 +02:00
Uoti Urpala
02bc48b67d Merge branch 'pause' 2009-01-15 00:29:51 +02:00
Uoti Urpala
38a76f7fdf core: Better -nocorrect-pts pause and filter-added frames handling
Rewrite the -nocorrect-pts frame creation code. The new version always
updates the visible frame when seeking while pausing, and supports
filter-added frames. It can not time those properly though.

Now the handling of filter-added frames in MPlayer always uses the new
method independently of the value of correct-pts but MEncoder still
expects the old behavior. Add a global variable that is set under
MEncoder only and change the filters to choose behavior based on that
instead of the correct_pts option.
2009-01-14 03:42:05 +02:00
Uoti Urpala
1f782eb802 core: Set OSD contents better while paused
Handle timing out of OSD messages and set the OSD function symbol to
pause instead of play. The implementation is hackish and should be
cleaned up later with other pause loop changes.
2009-01-14 02:06:14 +02:00
Uoti Urpala
8ed6d26977 vo_gl: Support changing OSD over existing frame 2009-01-14 02:06:14 +02:00
Uoti Urpala
321c93ee99 core: Rewrite some of the A/V sync related code
Notable functionality changes:
* Timing change between any two frames is now accurately limited to
  1/10 of their nominal distance. Previous code did not always use the
  correct duration.
* The status line now keeps showing the same A-V sync value from one
  video frame change to the next. Previously it kept recalculating
  the value using a new audio position but the same video position
  when the status line was updated between video frames. This
  incorrectly showed the video losing sync with audio.
* The status line now displays actual measured A-V difference in
  autosync mode too. The previous code displayed values that
  completely ignored real timing in autosync mode, showing 0 A-V
  difference even when video was significantly behind audio due to
  inadequate decoding speed. The new behavior can make the shown A-V
  values appear more unstable if the audio out has unreliable delay
  measurements (the most likely reason to use autosync), but this is a
  display change rather than a timing quality change.
* Autosync mode now tries to adjust timing by the amount of time
  vo_flip() calls take, so the calls start earlier and finish at the
  time the frame should be shown. Previously non-autosync mode
  adjusted for this but autosync did not.
* The warning about the system being too slow to decode the video in
  realtime is now displayed in autosync mode too.
2009-01-14 02:06:13 +02:00
compn
da01b889d7 add SLMJ fourcc to ffmjpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28310 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-13 17:08:29 +00:00
compn
88ac91a815 add binary codecs:
Forward JPEG Video Codec (FRWD)
Forward JPEG+Alpha Video Codec (FRWT)
Forward Uncompressed Video Codec (FRWU)
DideoNET SMV2 Codec (SMV2)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28309 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-13 17:05:18 +00:00
compn
5a4f84017c add nsvideo (NSVI) binary codec. works on uncommon samples list
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28308 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-13 11:53:54 +00:00
compn
a0379a5e04 add yamaha adpcm ffmpeg codec, works on sample
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28307 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-13 02:38:03 +00:00
diego
d9e88d6a82 Update copyright year.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28306 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 23:20:56 +00:00
diego
bd2a867e43 Sync with latest FFmpeg changes: Check for the availability of truncf().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 22:53:08 +00:00
diego
656660e560 spelling/grammar/wording/whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28304 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 19:48:51 +00:00
diego
0ccbcc55a7 Fix d_width vs. d_height typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28303 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 19:48:01 +00:00
diego
7b8ab957e0 Fix decvideo vs. dec_video typo noticed by Vineeth N, nvineeth gmail com.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28302 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 19:47:17 +00:00
diego
0acdb74854 Remove outdated comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28301 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 15:36:08 +00:00
diego
0cec4f5c7a cosmetics: Move CPU byte order check to a more sensible place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28300 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 15:31:53 +00:00
diego
7e5899961e Only check for YASM support on x86 systems.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28299 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 13:33:44 +00:00
diego
7daf30cd9c cosmetics: Move some checks to more logical places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28298 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 12:58:06 +00:00
ptt
872412b3c2 removed remaining english word
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28297 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 12:17:46 +00:00
diego
ebd030116f console output cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28296 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 11:28:01 +00:00
diego
9c46f5530c Only print "using XYZ" comment if XYZ has been set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28295 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-11 11:16:20 +00:00
diego
61f18f2381 Add missing const qualifier to mpctx_get_audio_out function declaration.
This fixes the warning:
mplayer.c:381: warning: return discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28294 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 20:01:47 +00:00
Gabrov
1bd85aa25c synced with r28279
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28293 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 14:23:42 +00:00
reimar
f5676d066b Reindent for "if" added in internal dvdnav patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28292 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 13:57:33 +00:00
reimar
1ee1a271f8 Support an "internal" dvdnav version to make it easier to compile with,
test and debug dvdnav SVN.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28291 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 13:51:02 +00:00
reimar
07fb95d10b Change vo_draw_text to a vo_draw_text_ext function which draws DVD navigation
highlights at the correct position with the high-resolution OSD of -vo gl.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28290 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 13:47:41 +00:00
compn
a846b34f3e add vdowave acm codec for format 0xFFFC
works on http://videorenditions.com/media/babyfaceVDO.avi


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28289 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 13:14:25 +00:00
reynaldo
fddeb46f9a Correct a few mistakes in the spanish translation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28288 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 01:58:55 +00:00
reynaldo
a7fc969ff6 TRIVIAL, Extend the copyright line to 2009. Patch by andrew .david .45 AT gmail.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28287 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 01:57:25 +00:00
diego
20109f0a2e Fix build: calc_drwXY was factorized into vo_calc_drwXY.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28286 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-09 20:50:25 +00:00
cehoyos
0fa2d1abd7 Factor calc_drwXY out of vo_xv and vo_xvmc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28285 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-09 15:25:24 +00:00
reimar
84b4007802 Consistently use tabs in svn:externals
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28284 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-09 10:32:01 +00:00
diego
762aab4719 Rearrange genres between numbers 53 and 63 into the correct order.
patch by Gil Kloepfer, mpldev09 kloepfer org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28283 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-09 10:14:03 +00:00
diego
f506bc4646 Replace reference to LICENSE file with GPL notice from said file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28282 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-09 09:52:20 +00:00
cehoyos
1015c5adf3 Add PIX_FMT_VDPAU_H264.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28281 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-08 19:54:43 +00:00
reimar
4af9bf7e02 Switch internal dvdread to libdvdread SVN external.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-08 19:28:28 +00:00
eugeni
4ae18c932e Clarify relationship between -ass and -fontconfig in the man page.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28279 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-07 16:39:56 +00:00
gpoirier
783df177bc sync w/r28122, patch by JRaSH % jrash06 A 163 P com %
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28278 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-06 20:44:51 +00:00
gpoirier
49981d20bb looks like I missed r27542...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28277 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-06 20:37:58 +00:00
eugeni
d3b5452f49 Support loading font faces other then the first one in a font file.
With -fontconfig, it is possible to select a face with index higher than
0 in a multi-face font file. Currently, with the old rendering code,
this information is lost and the first face is loaded. With this change,
index supplied by fontconfig is used for font loading.

Patch by Adrian Stutz, adrian sttz ch.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28276 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-06 16:44:47 +00:00
reimar
575766b8a7 Fix r28222, including alloca.h directly might break compilation.
Instead make sure os.h is included which includes alloca.h if possible.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28275 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 22:55:58 +00:00
diego
c464abb983 Fix some typos, add flv and trp to the list of video formats
and rearrange file type lists alphabetically.
patch by Konrad 'd3viCe' Pióro, konrad.pioro zask pl


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28274 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 22:18:35 +00:00
diego
5043110082 Rename libaf/af_format_alaw.c --> libaf/af_format_alaw.h and
libaf/af_format_ulaw.c --> libaf/af_format_ulaw.h.
Both files are not compiled but used as standard headers, so there
is no reason for them not be named like any other header file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28273 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 22:05:19 +00:00
diego
92805de182 Use standard multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28272 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 21:55:47 +00:00
diego
1a42f9781f Remove unnecessary local definition of _ISOC9X_SOURCE.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28271 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 21:55:19 +00:00
diego
75ec490919 small Turkish translation fixes, patch by Onur Küçük, onur delipenguen net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28270 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 21:37:47 +00:00