summaryrefslogtreecommitdiffstats
path: root/video/img_format.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-28 01:49:45 +0200
committerwm4 <wm4@nowhere>2013-07-28 19:25:07 +0200
commit5accc5e7c1dc020d1a0232da454104a4c056c2be (patch)
tree6abbf327d65ef046b159246778741250002eedff /video/img_format.h
parent1a7f062503ee26e2fdd5ad4a0fdd934bb9688037 (diff)
downloadmpv-5accc5e7c1dc020d1a0232da454104a4c056c2be.tar.bz2
mpv-5accc5e7c1dc020d1a0232da454104a4c056c2be.tar.xz
vdpau: split off decoder parts, use "new" libavcodec vdpau hwaccel API
Move the decoder parts from vo_vdpau.c to a new file vdpau_old.c. This file is named so because because it's written against the "old" libavcodec vdpau pseudo-decoder (e.g. "h264_vdpau"). Add support for the "new" libavcodec vdpau support. This was recently added and replaces the "old" vdpau parts. (In fact, Libav is about to deprecate and remove the "old" API without deprecation grace period, so we have to support it now. Moreover, there will probably be no Libav release which supports both, so the transition is even less smooth than we could hope, and we have to support both the old and new API.) Whether the old or new API is used is checked by a configure test: if the new API is found, it is used, otherwise the old API is assumed. Some details might be handled differently. Especially display preemption is a bit problematic with the "new" libavcodec vdpau support: it wants to keep a pointer to a specific vdpau API function (which can be driver specific, because preemption might switch drivers). Also, surface IDs are now directly stored in AVFrames (and mp_images), so they can't be forced to VDP_INVALID_HANDLE on preemption. (This changes even with older libavcodec versions, because mp_image always uses the newer representation to make vo_vdpau.c simpler.) Decoder initialization in the new code tries to deal with codec profiles, while the old code always uses the highest profile per codec. Surface allocation changes. Since the decoder won't call config() in vo_vdpau.c on video size change anymore, we allow allocating surfaces of arbitrary size instead of locking it to what the VO was configured. The non-hwdec code also has slightly different allocation behavior now. Enabling the old vdpau special decoders via e.g. --vd=lavc:h264_vdpau doesn't work anymore (a warning suggesting the --hwdec option is printed instead).
Diffstat (limited to 'video/img_format.h')
-rw-r--r--video/img_format.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/video/img_format.h b/video/img_format.h
index aac828d580..2438c231b8 100644
--- a/video/img_format.h
+++ b/video/img_format.h
@@ -242,14 +242,15 @@ enum mp_imgfmt {
// Hardware accelerated formats. Plane data points to special data
// structures, instead of pixel data.
- IMGFMT_VDPAU_MPEG1,
+ IMGFMT_VDPAU, // new decoder API
+ IMGFMT_VDPAU_MPEG1, // old API
IMGFMT_VDPAU_MPEG2,
IMGFMT_VDPAU_H264,
IMGFMT_VDPAU_WMV3,
IMGFMT_VDPAU_VC1,
IMGFMT_VDPAU_MPEG4,
- IMGFMT_VDPAU_FIRST = IMGFMT_VDPAU_MPEG1,
+ IMGFMT_VDPAU_FIRST = IMGFMT_VDPAU,
IMGFMT_VDPAU_LAST = IMGFMT_VDPAU_MPEG4,
IMGFMT_END,