Commit ad9c9440 authored by Anton Khirnov's avatar Anton Khirnov

qsvenc: support getting the session from an AVHWFramesContext

parent a0524d9b
...@@ -191,7 +191,7 @@ static mfxStatus qsv_frame_alloc(mfxHDL pthis, mfxFrameAllocRequest *req, ...@@ -191,7 +191,7 @@ static mfxStatus qsv_frame_alloc(mfxHDL pthis, mfxFrameAllocRequest *req,
mfxFrameInfo *i1 = &ctx->info; mfxFrameInfo *i1 = &ctx->info;
if (!(req->Type & MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET) || if (!(req->Type & MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET) ||
!(req->Type & (MFX_MEMTYPE_FROM_DECODE)) || !(req->Type & (MFX_MEMTYPE_FROM_DECODE | MFX_MEMTYPE_FROM_ENCODE)) ||
!(req->Type & MFX_MEMTYPE_EXTERNAL_FRAME)) !(req->Type & MFX_MEMTYPE_EXTERNAL_FRAME))
return MFX_ERR_UNSUPPORTED; return MFX_ERR_UNSUPPORTED;
if (i->Width != i1->Width || i->Height != i1->Height || if (i->Width != i1->Width || i->Height != i1->Height ||
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <mfx/mfxvideo.h> #include <mfx/mfxvideo.h>
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/hwcontext.h"
#include "libavutil/hwcontext_qsv.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/time.h" #include "libavutil/time.h"
...@@ -378,6 +380,11 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) ...@@ -378,6 +380,11 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
q->param.mfx.EncodedOrder = 0; q->param.mfx.EncodedOrder = 0;
q->param.mfx.BufferSizeInKB = 0; q->param.mfx.BufferSizeInKB = 0;
if (avctx->hw_frames_ctx) {
AVHWFramesContext *frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;
AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
q->param.mfx.FrameInfo = frames_hwctx->surfaces[0].Info;
} else {
q->param.mfx.FrameInfo.FourCC = MFX_FOURCC_NV12; q->param.mfx.FrameInfo.FourCC = MFX_FOURCC_NV12;
q->param.mfx.FrameInfo.Width = FFALIGN(avctx->width, q->width_align); q->param.mfx.FrameInfo.Width = FFALIGN(avctx->width, q->width_align);
q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, 32); q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, 32);
...@@ -391,6 +398,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) ...@@ -391,6 +398,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
q->param.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420; q->param.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
q->param.mfx.FrameInfo.BitDepthLuma = 8; q->param.mfx.FrameInfo.BitDepthLuma = 8;
q->param.mfx.FrameInfo.BitDepthChroma = 8; q->param.mfx.FrameInfo.BitDepthChroma = 8;
}
if (avctx->framerate.den > 0 && avctx->framerate.num > 0) { if (avctx->framerate.den > 0 && avctx->framerate.num > 0) {
q->param.mfx.FrameInfo.FrameRateExtN = avctx->framerate.num; q->param.mfx.FrameInfo.FrameRateExtN = avctx->framerate.num;
...@@ -653,12 +661,45 @@ static int qsv_init_opaque_alloc(AVCodecContext *avctx, QSVEncContext *q) ...@@ -653,12 +661,45 @@ static int qsv_init_opaque_alloc(AVCodecContext *avctx, QSVEncContext *q)
return 0; return 0;
} }
static int qsvenc_init_session(AVCodecContext *avctx, QSVEncContext *q)
{
int ret;
if (avctx->hwaccel_context) {
AVQSVContext *qsv = avctx->hwaccel_context;
q->session = qsv->session;
} else if (avctx->hw_frames_ctx) {
q->frames_ctx.hw_frames_ctx = av_buffer_ref(avctx->hw_frames_ctx);
if (!q->frames_ctx.hw_frames_ctx)
return AVERROR(ENOMEM);
ret = ff_qsv_init_session_hwcontext(avctx, &q->internal_session,
&q->frames_ctx, q->load_plugins,
q->param.IOPattern == MFX_IOPATTERN_IN_OPAQUE_MEMORY);
if (ret < 0) {
av_buffer_unref(&q->frames_ctx.hw_frames_ctx);
return ret;
}
q->session = q->internal_session;
} else {
ret = ff_qsv_init_internal_session(avctx, &q->internal_session,
q->load_plugins);
if (ret < 0)
return ret;
q->session = q->internal_session;
}
return 0;
}
int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
{ {
int iopattern = 0;
int opaque_alloc = 0; int opaque_alloc = 0;
int ret; int ret;
q->param.IOPattern = MFX_IOPATTERN_IN_SYSTEM_MEMORY;
q->param.AsyncDepth = q->async_depth; q->param.AsyncDepth = q->async_depth;
q->async_fifo = av_fifo_alloc((1 + q->async_depth) * q->async_fifo = av_fifo_alloc((1 + q->async_depth) *
...@@ -669,21 +710,31 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) ...@@ -669,21 +710,31 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
if (avctx->hwaccel_context) { if (avctx->hwaccel_context) {
AVQSVContext *qsv = avctx->hwaccel_context; AVQSVContext *qsv = avctx->hwaccel_context;
q->session = qsv->session; iopattern = qsv->iopattern;
q->param.IOPattern = qsv->iopattern;
opaque_alloc = qsv->opaque_alloc; opaque_alloc = qsv->opaque_alloc;
} }
if (!q->session) { if (avctx->hw_frames_ctx) {
ret = ff_qsv_init_internal_session(avctx, &q->internal_session, AVHWFramesContext *frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;
q->load_plugins); AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
if (ret < 0)
return ret;
q->session = q->internal_session; if (!iopattern) {
if (frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME)
iopattern = MFX_IOPATTERN_IN_OPAQUE_MEMORY;
else if (frames_hwctx->frame_type &
(MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET | MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET))
iopattern = MFX_IOPATTERN_IN_VIDEO_MEMORY;
}
} }
if (!iopattern)
iopattern = MFX_IOPATTERN_IN_SYSTEM_MEMORY;
q->param.IOPattern = iopattern;
ret = qsvenc_init_session(avctx, q);
if (ret < 0)
return ret;
ret = init_video_param(avctx, q); ret = init_video_param(avctx, q);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -1017,6 +1068,10 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) ...@@ -1017,6 +1068,10 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q)
q->session = NULL; q->session = NULL;
q->internal_session = NULL; q->internal_session = NULL;
av_buffer_unref(&q->frames_ctx.hw_frames_ctx);
av_freep(&q->frames_ctx.mids);
q->frames_ctx.nb_mids = 0;
cur = q->work_frames; cur = q->work_frames;
while (cur) { while (cur) {
q->work_frames = cur->next; q->work_frames = cur->next;
......
...@@ -98,6 +98,8 @@ typedef struct QSVEncContext { ...@@ -98,6 +98,8 @@ typedef struct QSVEncContext {
AVFifoBuffer *async_fifo; AVFifoBuffer *async_fifo;
QSVFramesContext frames_ctx;
// options set by the caller // options set by the caller
int async_depth; int async_depth;
int idr_interval; int idr_interval;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment