Commit Graph

70 Commits

Author SHA1 Message Date
wm4 0b428e4482 player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.

Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.

Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
2014-08-27 03:39:04 +02:00
wm4 960f0ccfa1 example.conf: demuxer-thread is now enabled by default
Provide a more useful example instead.
2014-08-19 20:10:26 +02:00
wm4 91be5e5c31 etc/example.conf: update cache options
Some of them changed semantics or got renamed.

Note that the replacements in the example.conf are not necessarily the
equivalents of the replaced options.
2014-08-09 00:13:16 +02:00
wm4 6eb955e274 manpage: update config file locations
Also add some explanations how the config paths are determined.
2014-06-28 15:55:09 +02:00
wm4 129ab5833d etc/example.conf: add example options for multichannel audio 2014-05-16 01:24:03 +02:00
wm4 014c0fb997 etc/example.conf: minor adjustments 2014-05-16 01:15:11 +02:00
wm4 07fe0412d9 etc/example.conf: remove spaces between key and value
Currently, they are allowed, but only because MPlayer happened to do
that. This might or might not be changed in the future.
2014-05-16 01:13:20 +02:00
Martin Herkt 8d7d6caeaf options: rename subtitle-related options
--ass           → --sub-ass
--autosub       → --sub-auto
--autosub-match → --sub-auto-match
--sub           → --sub-file
--subcp         → --sub-codepage
--subfps        → --sub-fps
2014-05-04 02:46:11 +02:00
wm4 8906e40925 example.conf: change subtitle codepage example to use UTF-8 fallback
This should be pretty safe compared to forcing the codepage.
2014-02-23 17:57:16 +01:00
Yaser Alraddadi d364e09174 example.conf: subtitle encoding
Signed-off-by: wm4 <wm4@nowhere>

Closes #580.
2014-02-23 17:54:13 +01:00
wm4 7cbb7b680c example.conf: add example for disabling the OSC 2013-10-14 23:42:53 +02:00
wm4 dd67b32acd example.conf: some modifications
Remove options which are too obscure and most likely not very useful in
general, or update them to something more modern. Add some comments
about how configuration files work in general.
2013-09-07 22:43:31 +02:00
wm4 8fe4790ec8 video: redo hw decoding initialization, add --hwdec=auto
Change how the HW decoding stuff is organized, the way it's initialized
in particular. Instead of duplicating the list of supported codecs for
hwaccel decoders, add a probe function which allows each decoder to
report whether it supports a given codec.

Add an "auto" choice to the --hwdec option, which automatically enables
hardware decoding if libavcodec and/or the VO supports it.

What mpv prints on the terminal changes a bit. Now it will just print
a single line whether hw decoding is used or not (and nothing at all if
no hw decoding at all was requested). The pretty violent fallback from
hw decoding to software decoding is still quite verbose and evil-looking
though.
2013-08-11 23:59:18 +02:00
wm4 7885fce7ea video: add --autofit and --autofit-larger options
--autofit=WxH sets the window size to a maximum width and/or height,
without changing the window's aspect ratio.

--autofit-larger=WxH does the same, but only if the video size is
actually larger than the window size that would result when using
the --autofit=WxH option with the same arguments.
2013-01-23 10:56:36 +01:00
wm4 58d196c07e video: different way to enable hardware decoding, add software fallback
Deprecate the hardware specific video codec entries (like ffh264vdpau).
Replace them with the --hwdec switch, which requests that a specific
hardware decoding API should be used. The codecs.conf entries will be
removed at a later time, but for now they are useful for testing and
compatibility.

Instead of --vc=ffh264vdpau, --hwdec=vdpau should be used.

Add a fallback if hardware decoding fails. Most hardware decoders
(including vdpau) support only a subset of h264, and having such a
fallback is supposed to enable a better user experience.
2013-01-13 17:39:32 +01:00
wm4 597a0c70f9 example.conf: all options should be commented
The file is written with the assumption that it doesn't change any
settings by default. Add a forgotten comment to fix this.
2012-11-14 11:48:18 +01:00
wm4 c12f408c47 example.conf: remove some useless options, add some useful ones 2012-11-11 18:10:14 +01:00
wm4 65fc530f0c Rename to "mpv"
This changes the name of this project to mpv. Most user-visible mentions
of "MPlayer" and "mplayer" are changed to "mpv". The binary name and the
default config file location are changed as well.

The new default config file location is: ~/.mpv/

Remove etc/mplayer.desktop. Apparently this was for the MPlayer GUI,
which has been removed from mplayer2 ages ago.

We don't have a logo, and the MS Windows resource files sort-of require
one, so leave etc/mplayer.ico/.xpm as-is.

Remove the debian and rpm packaging scripts. These contained outdated
dependencies and likely were more harmful than useful. (Patches which
add working and well-tested packaging are welcome.)
2012-10-12 10:14:32 +02:00
wm4 128bc6a21e Remove VESA/FBDEV remains, clean up example.conf
Remove VESA and FBDEV specific code that was forgotten when the
respective VOs were removed. Remove references to old or broken
stuff from example.conf.
2012-09-18 21:04:46 +02:00
mplayer-svn 0dce860f6c example.conf: add bandwidth example
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34782 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: compn
2012-08-03 01:49:35 +02:00
diego 52ba5ea684 example.conf: Disambiguate remarks about profiles
Also move the profiles to the bottom of the example configuration file
as the original remarks in the file suggested.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32754 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
compn 597dc5a388 example.conf: add some profile information and user-agent examples
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32709 b3059339-0415-0410-9bf9-f77b7e298cf2

add realplayer user-agent

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32712 b3059339-0415-0410-9bf9-f77b7e298cf2

add winamp useragent example

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32713 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 06:22:19 +02:00
compn 8448c91153 add spdif example from beandog
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30041 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-15 02:13:51 +00:00
compn de3620319a vdpau codecs config entry by beandog
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29987 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-09 20:20:18 +00:00
compn c145024193 fix apple.com trailer example, via carl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29975 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-03 21:04:53 +00:00
compn d75ab2c3b5 add user-agent example to fix apple.com/trailers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29967 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-26 18:01:13 +00:00
reimar 4532c8ad2f Add a profile example and (commented-out) useful defaults for dvdnav
to example.conf


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29825 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 18:53:05 +00:00
reimar 5727c58ece example for setting WMP user-agent string, helps when playlists
and media (streamed via mms) use the same URL (what an ugly case of
user-agent misuse!)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25961 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-08 18:33:39 +00:00
ben 2597f0c3e2 set -vc=ffmpeg12 as dvdnav prefered decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25851 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-25 19:27:42 +00:00
diego b5743fcfda Rename the default GUI skins directory from 'Skin' to 'skins', keeping
backwards compatibility.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17975 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 11:39:27 +00:00
diego 7fac067cae Put settings into a more meaningful order, some cosmetics.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17417 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-17 00:36:52 +00:00
diego aa83524a3b Improve option descriptions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17416 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-17 00:36:00 +00:00
diego 3c964509a6 Remove multi-language setting specification, it has little use.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17415 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-17 00:24:07 +00:00
diego 21fce2c1d6 Improve option descriptions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17414 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-17 00:18:21 +00:00
diego f4754a31eb cosmetic whitespace / layout changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17413 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-16 23:58:37 +00:00
diego 36d4355ed8 Comment out default settings. MPlayer should behave the same w/ or w/o
the default configuration file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17411 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-16 23:24:02 +00:00
diego 9b5f3d5e6f Smarter defaults, removing obsolete options.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17061 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-29 00:02:58 +00:00
diego 053e9d1c18 -aop is long obsolete.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17060 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-28 23:54:08 +00:00
rathann 49b1976bfa 1. -cache-prefil has not been renamed, it's been removed (-cache-seek-min
is a new option)
2. the default value is 50 not 5

noticed by iive


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16297 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-23 17:03:30 +00:00
rathann 0bf323e46e cache-prefill has been renamed to cache-seek-min, example config should
reflect this


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16279 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-20 21:00:51 +00:00
rathann 95c4eb180e options in config file have been using '-' instead of '_' for ages
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14894 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-03 03:11:44 +00:00
diego 2b31515a7c reorganized, reformatted, explanation improved, typos, wording
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12876 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-20 18:02:22 +00:00
iive 9b0d8c680f cache min fill adjustment, based on patch by Jeremy Huddleston
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12836 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-16 20:31:17 +00:00
wight 52e7eee811 swedish yes/no options support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11786 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-13 09:55:40 +00:00
wight 229554044d polish yes/no options support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11782 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-12 07:09:10 +00:00
joey 640f93d018 runtime 'stay-on-top' functionality
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11543 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-30 16:36:10 +00:00
diego 1b400d504c _ ---> - in -monitor* options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11292 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-27 10:39:59 +00:00
rfelker 68f4697c7e 100l, this is very bad
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10105 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-14 22:49:02 +00:00
gabucino 93f6c27d1f path fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8399 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-07 20:31:37 +00:00
arpi 7d5ae10689 documenting vesa 3 / GTF config
patch by Rudolf Marek <MAREKR2@cs.felk.cvut.cz>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7652 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-07 11:27:20 +00:00