[FFmpeg-cvslog] hwcontext_qsv: transfer data through the child context when VPP fails
Anton Khirnov
git at videolan.org
Thu Mar 30 23:45:57 EEST 2017
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Aug 10 14:58:08 2016 +0200| [8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d] | committer: Anton Khirnov
hwcontext_qsv: transfer data through the child context when VPP fails
Uploading/downloading data through VPP may not work for some formats, in
that case we can still try to call av_hwframe_transfer_data() on the
child context.
Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko at intel.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d
---
libavutil/hwcontext_qsv.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
index ae4b427..ff66af6 100644
--- a/libavutil/hwcontext_qsv.c
+++ b/libavutil/hwcontext_qsv.c
@@ -559,6 +559,40 @@ static int qsv_transfer_get_formats(AVHWFramesContext *ctx,
return 0;
}
+static int qsv_transfer_data_child(AVHWFramesContext *ctx, AVFrame *dst,
+ const AVFrame *src)
+{
+ QSVFramesContext *s = ctx->internal->priv;
+ AVHWFramesContext *child_frames_ctx = (AVHWFramesContext*)s->child_frames_ref->data;
+ int download = !!src->hw_frames_ctx;
+ mfxFrameSurface1 *surf = (mfxFrameSurface1*)(download ? src->data[3] : dst->data[3]);
+
+ AVFrame *dummy;
+ int ret;
+
+ dummy = av_frame_alloc();
+ if (!dummy)
+ return AVERROR(ENOMEM);
+
+ dummy->format = child_frames_ctx->format;
+ dummy->width = src->width;
+ dummy->height = src->height;
+ dummy->buf[0] = download ? src->buf[0] : dst->buf[0];
+ dummy->data[3] = surf->Data.MemId;
+ dummy->hw_frames_ctx = s->child_frames_ref;
+
+ ret = download ? av_hwframe_transfer_data(dst, dummy, 0) :
+ av_hwframe_transfer_data(dummy, src, 0);
+
+ dummy->buf[0] = NULL;
+ dummy->data[3] = NULL;
+ dummy->hw_frames_ctx = NULL;
+
+ av_frame_free(&dummy);
+
+ return ret;
+}
+
static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
const AVFrame *src)
{
@@ -570,6 +604,9 @@ static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
mfxStatus err;
if (!s->session_download) {
+ if (s->child_frames_ref)
+ return qsv_transfer_data_child(ctx, dst, src);
+
av_log(ctx, AV_LOG_ERROR, "Surface download not possible\n");
return AVERROR(ENOSYS);
}
@@ -614,6 +651,9 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
mfxStatus err;
if (!s->session_upload) {
+ if (s->child_frames_ref)
+ return qsv_transfer_data_child(ctx, dst, src);
+
av_log(ctx, AV_LOG_ERROR, "Surface upload not possible\n");
return AVERROR(ENOSYS);
}
More information about the ffmpeg-cvslog
mailing list