1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-23 00:06:56 +00:00
Commit Graph

2820 Commits

Author SHA1 Message Date
Uoti Urpala
47a04d40f3 Merge svn changes up to r30250 2010-01-25 14:34:56 +02:00
jrash
b67497a5b0 sync with en/mplayer.1 r30197
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30237 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-08 11:25:18 +00:00
Uoti Urpala
82780406d1 Merge svn changes up to r30199 2010-01-08 02:08:51 +02:00
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
diego
7ee42c3192 Fix a few typos in the matrixview section.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30197 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 11:14:47 +00:00
reimar
2f228574be Basic -vo matrixview documentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30183 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:55:15 +00:00
reimar
1ebc2cbbd8 Document -vo gl colorspace suboption.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30181 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:44:45 +00:00
jrash
85344073fa sync with en/mplayer.1 r30135
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30162 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 12:53:28 +00:00
Uoti Urpala
d46b86bc7c Merge svn changes up to r30136
Ignore another broken correct-pts change in 30134.
2009-12-30 00:56:10 +02:00
gpoirier
427039acff sync w/r30135 (up to date at last!)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30137 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-29 22:16:28 +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
compn
d47cd2aa67 change bandwidth value to bandwidth bytes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30135 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-29 13:43:03 +00:00
jrash
48b88b30e0 sync with en/mplayer.1 r30075
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30113 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 02:35:36 +00:00
gpoirier
7810431c02 sync w/r29731
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30093 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 20:57:44 +00:00
reimar
81783bceed Slightly improve vo_gl suboption documentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30075 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 21:08:14 +00:00
Uoti Urpala
efcc9ad712 Merge svn changes up to r30055 2009-12-18 18:54:42 +02:00
ptt
ce45b671b5 divided a line in two, was too long
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30057 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-18 15:57:22 +00:00
ptt
5f8ae5d0db synced with r30043
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30056 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-18 15:55:45 +00:00
jrash
c911be4073 sync with en/mplayer.1 r30053
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30054 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-18 11:15:09 +00:00
adrian
2a33cd01f6 Add support for -geometry to corevideo.
Based on a patch by Tim Wojtulewicz (timwoj at ieee dot org).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30043 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-15 20:38:54 +00:00
adrian
5f0b5dcaa9 Add -xineramascreen support to corevideo vo. Still prefer corevideo's own device_id parameter if it's set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30042 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-15 20:25:50 +00:00
Daniel Dawson
c3c0309eec Support for multiple editions in Matroska
Add code to intelligently choose an appropriate Matroska edition when
there are several. Will choose, in descending order of preference: the
edition chosen by the user through the option "-edition <edition id>"
if it exists, the first edition with EditionFlagDefault set to 1 if
there is one, or the first edition.
2009-12-04 19:43:17 +02:00
Uoti Urpala
5995bc175a Merge svn changes up to r29962 2009-11-23 01:56:21 +02:00
Uoti Urpala
74b7dcc5f4 core: Add support for decoder reordering of pts values
Add a mode where libavcodec's reordered_opaque feature is used to
associate container packet timestamps with decoded frames. This should
improve behavior at least for MPEG files with interlaced h264; the
previous code does not cope well with the libavformat demuxer
producing two field packets with separate timestamps but the
libavcodec h264 decoder only producing a single output frame for those
two packets (so half the timestamps have no associated output frame).

The current libavformat mpeg demuxer seems to finally work with
interlaced h264 files and produce valid timestamps which are useful
with a mode like this.

By default MPlayer now selects between this new mode and the old one
automatically based on the number of timestamp problems they cause; by
default the new mode is used if both seem to work. The new option
-pts-association-mode can be used to force a particular mode. If
correct-pts mode is disabled this has no effect on timing.

Also remove the "EXPERIMENTAL" marker from the manpage description of
-correct-pts.
2009-11-21 20:53:10 +02:00
Uoti Urpala
4aff125b35 VO: Keep aspect by adding black bars in window mode too if necessary
By default (without -nokeepaspect) MPlayer tries to maintain video
aspect ratio by using window manager hints to keep output window
aspect when resizing. Before this commit it would however scale the
video to completely fill the window even if the window manager did not
respect those hints. Change the behavior to add black bars like in
fullscreen mode instead in this case.
2009-11-20 23:15:11 +02:00
Gabrov
4507c8aa2f synced with r29912
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29918 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-16 15:20:57 +00:00
Uoti Urpala
287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
Uoti Urpala
b8861ce8e2 Support VDPAU MPEG4 hardware decoding
Original patch by NVIDIA.
2009-11-16 02:46:33 +02:00
Uoti Urpala
14bb3416c7 vo_vdpau: Add support for high-quality scaling feature
Part of the code is currently under #ifdef to allow compilation with
older VDPAU library versions; that can be removed later.

Partially based on a patch by Carl Eugen Hoyos.
2009-11-15 18:39:48 +02:00
Uoti Urpala
98ee8dd159 Add yuv_colorspace property, implemented in vo_vdpau and vo_xv
Add a property to select YUV colorspace. Currently implemented only in
vo_vdpau and vo_xv. Allows switching between BT.601, BT.709 and
SMPTE-240M (vdpau only).

The xv support uses the "XV_ITURBT_709" attribute. At least my NVIDIA
card supports that; I don't know whether other xv implementations do.

Bind the colorspace switch to the 'c' key by default. 'c' is currently
used by vo_sdl for some fullscreen mode change thing, but at the moment
that does not conflict and if it will in the future then vo_sdl can
change.

VDPAU part based on a patch from Lauri Mylläri <lauri.myllari@gmail.com>
2009-11-15 17:03:41 +02:00
Uoti Urpala
201bef7ee1 Implement vsync-aware frame timing for VDPAU
Main things added are custom frame dropping for VDPAU to work around
the display FPS limit, frame timing adjustment to avoid jitter when
video frame times keep falling near vsyncs, and use of VDPAU's timing
feature to keep one future frame queued in advance.

NVIDIA's VDPAU implementation refuses to change the displayed frame
more than once per vsync. This set a limit on how much video could be
sped up, and caused problems for nearly all videos on low-FPS video
projectors (playing 24 FPS video on a 24 FPS projector would not work
reliably as MPlayer may need to slightly speed up the video for AV
sync). This commit adds a framedrop mechanism that drops some frames
so that no more than one is sent for display per vsync. The code
tries to select the dropped frames smartly, selecting the best one to
show for each vsync. Because of the timing features needed the drop
functionality currently does not work if the correct-pts option is
disabled.

The code also adjusts frame timing slightly to avoid jitter. If you
for example play 24 FPS video content on a 72 FPS display then
normally a frame would be shown for 3 vsyncs, but if the frame times
happen to fall near vsyncs and change between just before and just
after then there could be frames alternating between 2 and 4
vsyncs. The code changes frame timing by up to one quarter vsync
interval to avoid this.

The above functionality depends on having reliable vsync timing
information available. The display refresh rate is not directly
provided by the VDPAU API. The current code uses information from the
XF86VidMode extension if available; I'm not sure how common cases
where that is inaccurate are. The refresh rate can be specified
manually if necessary.

After the changes in this commit MPlayer now always tries to keep one
frame queued for future display using VDPAU's internal timing
mechanism (however no more than 50 ms to the future). This should make
video playback somewhat more robust against timing inaccuracies caused
by system load.
2009-11-15 12:45:58 +02:00
ptt
c6bb4950bd cosmetics and grammar fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29911 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-13 15:26:16 +00:00
jrash
1de7fb056b sync with en/mplayer.1 r29905
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29909 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-13 14:12:25 +00:00
ptt
327414a214 synced with r29905
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29907 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-13 07:54:30 +00:00
ptt
cbda7a7bf4 synced with r29885
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29906 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-12 17:04:41 +00:00
ptt
4147bee3e9 cosmetic fixes as pointed out by diego
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29905 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-12 10:39:52 +00:00
ptt
ab4bdb64e1 Added -name, -title and -use-filename-title options and implementation in X11 vos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29904 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-12 09:21:53 +00:00
cehoyos
2b93a48ac8 Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capable
hardware.

Original patch by NVIDIA corporation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29885 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 19:11:13 +00:00
tack
c61f1c20c2 Update man page to reflect support for up to 8 channels.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29883 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 18:01:10 +00:00
reimar
9a8a73e547 Add support for DVB teletext.
Patch by Francesco Lavra [francescolavra interfree it] with modifications by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29875 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 11:31:47 +00:00
reimar
cc807663bf Clarify possible issues with gmplayer commandline options due to conflicts
with separate gui configuration file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29852 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 15:01:05 +00:00
jrash
cc057549fb sync with en/mplayer.1 r29823
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29833 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-06 12:30:56 +00:00
cehoyos
a10b3f08bf Add new VDPAU feature high-quality-scaling (and require newer library).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29823 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-04 15:30:13 +00:00
diego
4ccaa41db0 The "ilaced" suboption of vf_scale was renamed to "interlaced".
Fixes Bugzilla #1596.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29814 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-02 22:32:47 +00:00
cehoyos
dbe7c02a78 Improve VDPAU noforce-mixer documentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29813 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-02 16:42:37 +00:00
jrash
ffb717be28 sync with en/mplayer.1 r29805
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29806 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-31 02:00:00 +00:00
corey
0746f99a0a Slightly change behavior of "none" if fstype specification.
In a list of enabled fstypes, "none" now clears the list rather than
disabling all fstypes and interrupting the parser. To enable only one
(or more) fstypes, list the types to enable after "none".

For example:
"-fstype none" is the same as before: all disabled
"-fstype none,fullscreen" enables only the fullscreen type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29805 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-30 22:18:29 +00:00
cehoyos
29c937fe80 Allow image format BGRA when using vo vdpau.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29798 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-27 08:28:08 +00:00