summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-11 18:16:42 +0100
committerwm4 <wm4@nowhere>2013-01-13 17:39:32 +0100
commit58d196c07e4faae0e9e7c03c64029c5c36e03c9a (patch)
treed0dd9713e7e2ba490ecaeac4b1a9150a93c97a2c /DOCS
parentdab286a159eacdfd995190dcd29513bad9e9fac2 (diff)
downloadmpv-58d196c07e4faae0e9e7c03c64029c5c36e03c9a.tar.bz2
mpv-58d196c07e4faae0e9e7c03c64029c5c36e03c9a.tar.xz
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.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/changes.rst1
-rw-r--r--DOCS/man/en/options.rst12
2 files changed, 13 insertions, 0 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index e8efef843f..2b821d68bd 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -117,6 +117,7 @@ Command line switches
-spugauss --sub-gauss
-vobsub --sub (pass the .idx file)
-ass-bottom-margin --vf=sub=bottom:top
+ -vc ffh264vdpau (etc.) --hwdec=vdpau
=================================== ===================================
input.conf and slave commands
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 5265968269..936f3b3293 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -779,6 +779,18 @@
negative of the image with this option. Not supported by all video output
drivers.
+--hwdec=<api>
+ Specify the hardware video decoding API that should be used if possible.
+ Whether hardware decoding is actually done depends on the video codec. If
+ hardware decoding is not possible, mpv will fall back to software decoding.
+
+ <api> can be one of the following:
+
+ :no: always use software decoding (default)
+ :vdpau: works with nvidia drivers only, requires ``--vo=vdpau``
+ :vda: OSX
+ :crystalhd: Broadcom Crystal HD
+
--identify
Deprecated. Use ``TOOLS/mpv_identify.sh``.