Commit Graph
8253 Commits
Author SHA1 Message Date
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
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 <[email protected]>
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
tack 629eee5817 Replace dead link explaining why not to use HTML on the mailing lists.
New link is http://efn.no/html-bad.html


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29902 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 15:15:46 +00:00
reimar c62952a9ac Add a "tips and tricks" section to the slave mode documentation.
Hopefully will help in using some of its rather obscure features.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29900 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 11:38:41 +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
reynaldo 3efb64e34e So Long, and Thanks for All the Fish
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29824 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 04:12:39 +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
ptt a59c8e7d6a synced with r29791
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29792 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-22 15:40:04 +00:00
diego 9e9c609a36 Break an output line for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29791 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-22 14:19:10 +00:00
ptt 789ad059d1 cosmetic fixes in bs2b and vdpau sections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29790 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-22 14:06:38 +00:00
ptt e8be11765a removed daniele forghieri from italian man mantainers (as said by diego and him)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29773 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-14 11:27:12 +00:00
ptt 581a08677c synced with r29771
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29772 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-14 11:26:04 +00:00
cehoyos 14c5e64fd9 Support SMPTE-240M colourspace in vo_vdpau.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29771 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-12 21:17:38 +00:00
cehoyos 83fe8c63c5 Add colorspace option to vo_vdpau.
Allows to use ITU-R BT.709 instead of the default ITU-R BT.601.

Patch by Lauri Mylläri, lauri D myllari gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29769 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-10 20:53:42 +00:00
ptt 5069d954b0 some coherence's fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29766 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 17:44:23 +00:00
ptt 5d60341790 cosmetics in channels/capture sections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29765 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 17:40:47 +00:00
ptt c72ef416ca synced with r29762
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29764 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 16:59:36 +00:00
ptt 9514824cf9 added myself to italian man mantainers section, since i'm the one that does that
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29763 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 16:45:24 +00:00
ptt 2781bab3af various little aesthetic fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29762 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 16:42:56 +00:00
Uoti Urpala f43c06930f manpage: Fix typo in -noordered-chapters option name
The manual page said "-noorderedchapters" without a hyphen while the
actual option name is "-noordered-chapters".
2009-10-08 19:42:03 +03:00
ptt 6aef595f93 synced with r28576
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29760 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 11:31:24 +00:00
diego ad4e739ffa Clarify screenshot filter description.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29756 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-06 12:38:06 +00:00
Uoti Urpala 7fd3eb0f74 Merge svn changes up to r29752
As part of merging subtitle-in-terminal changes make
update_subtitles() only clear existing subtitles if called with the
reset argument, and not try to set new ones. Later calls should set
the needed new subtitles, and this change avoids some problems with
trying to set subtitles when mp_property_sub() in command.c gets
called from initialization code before full initialization.
2009-10-06 04:48:00 +03:00
attila cbbc886820 add a warning to the description of -vf screenshot to add it after
all other filters that should apply to it
(fix PEBCAK as seen on #mplayer)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29752 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-05 12:40:34 +00:00
jrash e259900901 sync with en/mplayer.1 r29731
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29746 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-01 05:41:47 +00:00
reimar 55cd87882c Document -nosub option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29731 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-28 11:33:40 +00:00
Uoti Urpala a0854c1978 commands: Add set_property_osd and step_property_osd 2009-09-19 05:30:20 +03:00
Uoti Urpala e1ecc43152 Merge svn changes up to r29684 2009-09-16 22:28:12 +03:00
jrash 7352779ed8 sync with en/mplayer.1 r29661
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29672 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-12 06:10:42 +00:00
Gabrov 8768c51828 synced with r29670
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29671 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-11 15:47:43 +00:00