summaryrefslogtreecommitdiffstats
path: root/video/decode/lavc.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-01-12 13:15:45 +0100
committerwm4 <wm4@nowhere>2017-01-12 14:00:19 +0100
commite618b1b3522c53036b8ffd95d352b6747603edc4 (patch)
tree5be78cb7beaf32a4ea5e1757d6ef5825d89cf355 /video/decode/lavc.h
parentfb4ae3c06ca6598ecf31d9e39276f87091e5037d (diff)
downloadmpv-e618b1b3522c53036b8ffd95d352b6747603edc4.tar.bz2
mpv-e618b1b3522c53036b8ffd95d352b6747603edc4.tar.xz
vaapi: handle image copying for vaapi-copy in common code
Other hwdecs will also be able to use this (as soon as they are switched to use AVHWFramesContext). As an additional feature, failing to copy back the frame counts as hardware decoding failure and can trigger fallback. This can be done easily now, because it needs no way to communicate this from the hwaccel glue code to the common code. The old code is still required for the old decode API, until we either drop or rewrite it. vo_vaapi.c's OSD code (fuck...) also uses these surface functions to a higher degree.
Diffstat (limited to 'video/decode/lavc.h')
-rw-r--r--video/decode/lavc.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/video/decode/lavc.h b/video/decode/lavc.h
index 3c38e6878d..fe7f9937f4 100644
--- a/video/decode/lavc.h
+++ b/video/decode/lavc.h
@@ -7,6 +7,7 @@
#include "demux/stheader.h"
#include "video/mp_image.h"
+#include "video/mp_image_pool.h"
#include "video/hwdec.h"
#define HWDEC_DELAY_QUEUE_COUNT 2
@@ -61,6 +62,8 @@ typedef struct lavc_ctx {
bool hwdec_request_reinit;
int hwdec_fail_count;
+
+ struct mp_image_pool *hwdec_swpool;
} vd_ffmpeg_ctx;
struct vd_lavc_hwdec {