diff options
author | Mark Thompson <sw@jkqxz.net> | 2017-03-05 02:57:36 +0300 |
---|---|---|
committer | Mark Thompson <sw@jkqxz.net> | 2017-06-15 00:26:32 +0300 |
commit | 8aa3c2df1ae64b4b30462cc8a164520e65312d1a (patch) | |
tree | 4686f4687a69ee4355c0142c3bdddfa1091c4286 /libavcodec/qsvdec.c | |
parent | 91c3b50d74ba8874ea090c29063f953f4cc90ba9 (diff) |
qsvdec: Allow use of hw_device_ctx to make the internal session
(cherry picked from commit 8848ba0bd6b035af77d4f13aa0d8aaaad9806fe8)
Diffstat (limited to 'libavcodec/qsvdec.c')
-rw-r--r-- | libavcodec/qsvdec.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 74866b57ff..c00817f1d9 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -42,7 +42,7 @@ #include "qsvdec.h" static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession session, - AVBufferRef *hw_frames_ref) + AVBufferRef *hw_frames_ref, AVBufferRef *hw_device_ref) { int ret; @@ -68,6 +68,18 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses } q->session = q->internal_session; + } else if (hw_device_ref) { + if (q->internal_session) { + MFXClose(q->internal_session); + q->internal_session = NULL; + } + + ret = ff_qsv_init_session_device(avctx, &q->internal_session, + hw_device_ref, q->load_plugins); + if (ret < 0) + return ret; + + q->session = q->internal_session; } else { if (!q->internal_session) { ret = ff_qsv_init_internal_session(avctx, &q->internal_session, @@ -133,7 +145,7 @@ static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q) iopattern = MFX_IOPATTERN_OUT_SYSTEM_MEMORY; q->iopattern = iopattern; - ret = qsv_init_session(avctx, q, session, avctx->hw_frames_ctx); + ret = qsv_init_session(avctx, q, session, avctx->hw_frames_ctx, avctx->hw_device_ctx); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error initializing an MFX session\n"); return ret; |