summaryrefslogtreecommitdiffstats
path: root/etc
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 /etc
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 'etc')
-rw-r--r--etc/codecs.conf12
-rw-r--r--etc/example.conf4
2 files changed, 14 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 7fb7b0fca6..46f87e1cd6 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -180,6 +180,7 @@ videocodec ffmpeg12
driver ffmpeg
dll "mpegvideo"
+; deprecated in favor of --hwdec=vdpau
videocodec ffmpeg12vdpau
info "FFmpeg MPEG-1/2 (VDPAU)"
status working
@@ -210,6 +211,7 @@ videocodec ffmpeg12vdpau
driver ffmpeg
dll "mpegvideo_vdpau"
+; deprecated in favor of --hwdec=crystalhd
videocodec ffmpeg2crystalhd
info "FFmpeg MPEG-2 (CrystalHD)"
status working
@@ -576,6 +578,7 @@ videocodec ffdivx
driver ffmpeg
dll msmpeg4
+; deprecated in favor of --hwdec=crystalhd
videocodec ffdivxcrystalhd
info "FFmpeg DivX ;-) (MSMPEG-4 v3) (CrystalHD)"
status buggy
@@ -638,6 +641,7 @@ videocodec ffwmvp
driver ffmpeg
dll wmv3
+; deprecated in favor of --hwdec=vdpau
videocodec ffwmv3vdpau
info "FFmpeg WMV3/WMV9 (VDPAU)"
status buggy
@@ -645,6 +649,7 @@ videocodec ffwmv3vdpau
driver ffmpeg
dll wmv3_vdpau
+; deprecated in favor of --hwdec=crystalhd
videocodec ffwmv3crystalhd
info "FFmpeg WMV3/WMV9 (CrystalHD)"
status buggy
@@ -660,6 +665,7 @@ videocodec ffvc1
driver ffmpeg
dll vc1
+; deprecated in favor of --hwdec=vdpau
videocodec ffvc1vdpau
info "FFmpeg WVC1 (VDPAU)"
status buggy
@@ -668,6 +674,7 @@ videocodec ffvc1vdpau
driver ffmpeg
dll vc1_vdpau
+; deprecated in favor of --hwdec=crystalhd
videocodec ffvc1crystalhd
info "FFmpeg WVC1 (CrystalHD)"
status buggy
@@ -691,6 +698,7 @@ videocodec ffh264
driver ffmpeg
dll h264
+; deprecated in favor of --hwdec=vdpau
videocodec ffh264vdpau
info "FFmpeg H.264 (VDPAU)"
status working
@@ -704,6 +712,7 @@ videocodec ffh264vdpau
driver ffmpeg
dll h264_vdpau
+; deprecated in favor of --hwdec=crystalhd
videocodec ffh264crystalhd
info "FFmpeg H.264 (CrystalHD)"
status working
@@ -718,6 +727,7 @@ videocodec ffh264crystalhd
driver ffmpeg
dll h264_crystalhd
+; deprecated in favor of --hwdec=vda
videocodec ffh264vda
info "FFmpeg H.264 (VDA)"
status working
@@ -772,6 +782,7 @@ videocodec ffodivx
driver ffmpeg
dll mpeg4 ;opendivx
+; deprecated in favor of --hwdec=vdpau
videocodec ffodivxvdpau
info "FFmpeg MPEG-4,DIVX-4/5 (VDPAU)"
status working
@@ -804,6 +815,7 @@ videocodec ffodivxvdpau
driver ffmpeg
dll mpeg4_vdpau
+; deprecated in favor of --hwdec=crystalhd
videocodec ffodivxcrystalhd
info "FFmpeg MPEG-4,DIVX-4/5 (CrystalHD)"
status working
diff --git a/etc/example.conf b/etc/example.conf
index 6fe1b6bdf1..bb37a5e26d 100644
--- a/etc/example.conf
+++ b/etc/example.conf
@@ -87,8 +87,8 @@
# but only take effect when the profile is active.
#[vo.vdpau]
-# Use hardware decoding (this will break playback of some h264 files)
-#vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau,
+# Use hardware decoding (this might break playback of some h264 files)
+#hwdec=vdpau
# Most video filters do not work with vdpau.
#vf-clr=yes