From f18c4175ad8e772c0005ac6280291af425c16cc2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 29 Apr 2018 02:55:27 +0200 Subject: encode: remove old timestamp handling This effectively makes --ocopyts the default. The --ocopyts option itself is also removed, because it's redundant. --- DOCS/encoding.rst | 13 ++++++------- DOCS/interface-changes.rst | 3 +++ DOCS/man/encode.rst | 33 --------------------------------- 3 files changed, 9 insertions(+), 40 deletions(-) (limited to 'DOCS') diff --git a/DOCS/encoding.rst b/DOCS/encoding.rst index 6f9cd1a390..15e38a4581 100644 --- a/DOCS/encoding.rst +++ b/DOCS/encoding.rst @@ -3,8 +3,7 @@ General usage :: - mpv infile -o outfile [-of outfileformat] [-ofopts formatoptions] \ - [-ofps outfps | -oautofps] [-oharddup] [-ocopyts | -orawts] [-oneverdrop] \ + mpv infile -o outfile [-of outfileformat] [-ofopts formatoptions] [-orawts] \ [(any other mpv options)] \ -ovc outvideocodec [-ovcopts outvideocodecoptions] \ -oac outaudiocodec [-oacopts outaudiocodecoptions] @@ -60,13 +59,13 @@ for. Typical MPEG-4 Part 2 ("ASP", "DivX") encoding, AVI container:: mpv infile -o outfile.avi \ - -ofps 25 \ + --vf=fps=25 \ -ovc mpeg4 -ovcopts qscale=4 \ -oac libmp3lame -oacopts ab=128k -Note: AVI does not support variable frame rate, so -ofps must be used. The -frame rate should ideally match the input (25 for PAL, 24000/1001 or 30000/1001 -for NTSC) +Note: AVI does not support variable frame rate, so the fps filter must be used. +The frame rate should ideally match the input (25 for PAL, 24000/1001 or +30000/1001 for NTSC) Typical MPEG-4 Part 10 ("AVC", "H.264") encoding, Matroska (MKV) container:: @@ -129,7 +128,7 @@ What works ========== * Encoding at variable frame rate (default) -* Encoding at constant frame rate using -ofps framerate -oharddup +* Encoding at constant frame rate using --vf=fps=RATE * 2-pass encoding (specify flags=+pass1 in the first pass's -ovcopts, specify flags=+pass2 in the second pass) * Hardcoding subtitles using vobsub, ass or srt subtitle rendering (just diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 9c29f31b0a..fa42b1dc81 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -94,6 +94,9 @@ Interface changes the future. (This kind of waiting was always a feature to prevent that playback is started while scripts are only half-loaded.) - deprecate --ovoffset, --oaoffset, --ovfirst, --oafirst + - remove the following encoding options: --ocopyts (now the default, old + timestamp handling is gone), --oneverdrop (now default), --oharddup (you + need to use --vf=fps=VALUE), --ofps, --oautofps, --omaxfps - remove --video-stereo-mode. This option was broken out of laziness, and nobody wants to fix it. Automatic 3D down-conversion to 2D is also broken, although you can just insert the stereo3d filter manually. The obscurity diff --git a/DOCS/man/encode.rst b/DOCS/man/encode.rst index 73c1b6b35c..4c885ea168 100644 --- a/DOCS/man/encode.rst +++ b/DOCS/man/encode.rst @@ -24,32 +24,6 @@ You can encode files from one format/codec to another using this facility. ``--ofopts=""`` Completely empties the options list. -``--ofps=`` - Specifies the output format time base (default: 24000). Low values like 25 - limit video fps by dropping frames. - -``--oautofps`` - Sets the output format time base to the guessed frame rate of the input - video (simulates MEncoder behavior, useful for AVI; may cause frame drops). - Note that not all codecs and not all formats support VFR encoding, and some - which do have bugs when a target bitrate is specified - use ``--ofps`` or - ``--oautofps`` to force CFR encoding in these cases. - -``--omaxfps=`` - Specifies the minimum distance of adjacent frames (default: 0, which means - unset). Content of lower frame rate is not readjusted to this frame rate; - content of higher frame rate is decimated to this frame rate. - -``--oharddup`` - If set, the frame rate given by ``--ofps`` is attained not by skipping time - codes, but by duplicating frames (constant frame rate mode). - -``--oneverdrop`` - If set, frames are never dropped. Instead, time codes of video are - readjusted to always increase. This may cause AV desync, though; to work - around this, use a high-fps time base using ``--ofps`` and absolutely - avoid ``--oautofps``. - ``--oac=`` Specifies the output audio codec. See ``--oac=help`` for a full list of supported codecs. @@ -113,13 +87,6 @@ You can encode files from one format/codec to another using this facility. Force the video stream to become the first stream in the output. By default, the order is unspecified. Deprecated. -``--ocopyts`` - Copies input pts to the output video (not supported by some output - container formats, e.g. AVI). Discontinuities are still fixed. - By default, audio pts are set to playback time and video pts are - synchronized to match audio pts, as some output formats do not support - anything else. - ``--orawts`` Copies input pts to the output video (not supported by some output container formats, e.g. AVI). In this mode, discontinuities are not fixed -- cgit v1.2.3