RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-11 08:37:59 +00:00
Code Issues Releases Wiki Activity

options: rename --mkv-subtitle-preroll, --dtshd

Browse Source 
We still keep the old names as alias for short-time compatibility.
This commit is contained in:
wm4 2013-06-28 15:26:30 +02:00
parent 07131a9523
commit f296258de0
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
DOCS/man/en/options.rst
View File

@ -44,6 +44,16 @@
unneeded and pass all unknown options through the AVOption system is
welcome. A full list of AVOptions can be found in the FFmpeg manual.
--ad-spdif-dtshd=<yes|no>, --dtshd, --no-dtshd
When using DTS passthrough, output any DTS-HD track as-is.
With ``ad-spdif-dtshd=no`` (the default) only the DTS Core parts will be
output.
DTS-HD tracks can be sent over HDMI but not over the original
coax/toslink S/PDIF system.
``--dtshd`` and ``--no-dtshd`` are deprecated aliases.
--af=<filter1[=parameter1:parameter2:...],filter2,...>
Specify a list of audio filters to apply to the audio stream. See
`audio_filters` for details and descriptions of the available filters.
@ -546,6 +556,31 @@
Encryption key the demuxer should use. This is the raw binary data of
the key converted to a hexadecimal string.
--demuxer-mkv-subtitle-preroll, --mkv-subtitle-preroll
Try harder to show embedded soft subtitles when seeking somewhere. Normally,
it can happen that the subtitle at the seek target is not shown due to how
some container file formats are designed. The subtitles appear only if
seeking before or exactly to the position a subtitle first appears. To
make this worse, subtitles are often timed to appear a very small amount
before the associated video frame, so that seeking to the video frame
typically does not demux the subtitle at that position.
Enabling this option makes the demuxer start reading data a bit before the
seek target, so that subtitles appear correctly. Note that this makes
seeking slower, and is not guaranteed to always work. It only works if the
subtitle is close enough to the seek target.
Works with the internal Matroska demuxer only. Always enabled for absolute
and hr-seeks, and this option changes behavior with relative or imprecise
seeks only.
See also ``--hr-seek-demuxer-offset`` option. This option can achieve a
similar effect, but only if hr-seek is active. It works with any demuxer,
but makes seeking much slower, as it has to decode audio and video data,
instead of just skipping over it.
``--mkv-subtitle-preroll`` is a deprecated alias.
--demuxer-rawaudio-channels=<value>
Number of channels (or channel layout) if ``--demuxer=rawaudio`` is used
(default: stereo).
@ -587,13 +622,6 @@
Time in milliseconds to recognize two consecutive button presses as a
double-click (default: 300).
--dtshd, --no-dtshd
When using DTS passthrough, output any DTS-HD track as-is.
With ``--no-dtshd`` (the default) only the DTS Core parts will be output.
DTS-HD tracks can be sent over HDMI but not over the original
coax/toslink S/PDIF system.
--dvbin=<options>
Pass the following parameters to the DVB input module, in order to
override the default ones:
@ -1091,29 +1119,6 @@
:fps=<value>: output fps (default: 25)
:type=<value>: input file type (available: jpeg, png, tga, sgi)
--mkv-subtitle-preroll
Try harder to show embedded soft subtitles when seeking somewhere. Normally,
it can happen that the subtitle at the seek target is not shown due to how
some container file formats are designed. The subtitles appear only if
seeking before or exactly to the position a subtitle first appears. To
make this worse, subtitles are often timed to appear a very small amount
before the associated video frame, so that seeking to the video frame
typically does not demux the subtitle at that position.
Enabling this option makes the demuxer start reading data a bit before the
seek target, so that subtitles appear correctly. Note that this makes
seeking slower, and is not guaranteed to always work. It only works if the
subtitle is close enough to the seek target.
Works with the internal Matroska demuxer only. Always enabled for absolute
and hr-seeks, and this option changes behavior with relative or imprecise
seeks only.
See also ``--hr-seek-demuxer-offset`` option. This option can achieve a
similar effect, but only if hr-seek is active. It works with any demuxer,
but makes seeking much slower, as it has to decode audio and video data,
instead of just skipping over it.
--mixer=<device>
Use a mixer device different from the default ``/dev/mixer``. For ALSA
this is the mixer name.

8
core/options.c
View File

@ -407,7 +407,6 @@ const m_option_t mp_opts[] = {
OPT_STRING("audio-demuxer", audio_demuxer_name, 0),
OPT_STRING("sub-demuxer", sub_demuxer_name, 0),
OPT_FLAG("extbased", extension_parsing, 0),
OPT_FLAG("mkv-subtitle-preroll", mkv_subtitle_preroll, 0),
{"mf", (void *) mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL},
#ifdef CONFIG_RADIO
@ -452,7 +451,9 @@ const m_option_t mp_opts[] = {
OPT_STRING("ad", audio_decoders, 0),
OPT_STRING("vd", video_decoders, 0),
OPT_FLAG("dtshd", dtshd, 0),
OPT_FLAG("ad-spdif-dtshd", dtshd, 0),
OPT_FLAG("dtshd", dtshd, 0), // old alias
OPT_CHOICE("hwdec", hwdec_api, 0,
({"no", 0},
@ -485,6 +486,9 @@ const m_option_t mp_opts[] = {
{"demuxer-rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG},
{"demuxer-rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG},
OPT_FLAG("demuxer-mkv-subtitle-preroll", mkv_subtitle_preroll, 0),
OPT_FLAG("mkv-subtitle-preroll", mkv_subtitle_preroll, 0), // old alias
// ------------------------- subtitles options --------------------
OPT_STRINGLIST("sub", sub_name, 0),