#include <mfx/mfxvideo.h>
#include "libavutil/common.h"
+#include "libavutil/hwcontext.h"
+#include "libavutil/hwcontext_qsv.h"
#include "libavutil/mem.h"
#include "libavutil/log.h"
+#include "libavutil/pixdesc.h"
#include "libavutil/pixfmt.h"
#include "libavutil/time.h"
#include "qsv_internal.h"
#include "qsvdec.h"
-int ff_qsv_map_pixfmt(enum AVPixelFormat format)
+static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession session,
+ AVBufferRef *hw_frames_ref)
{
- switch (format) {
- case AV_PIX_FMT_YUV420P:
- case AV_PIX_FMT_YUVJ420P:
- return AV_PIX_FMT_NV12;
- default:
- return AVERROR(ENOSYS);
- }
-}
+ int ret;
-static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession session)
-{
- if (!session) {
+ if (session) {
+ q->session = session;
+ } else if (hw_frames_ref) {
+ if (q->internal_session) {
+ MFXClose(q->internal_session);
+ q->internal_session = NULL;
+ }
+ av_buffer_unref(&q->frames_ctx.hw_frames_ctx);
+
+ q->frames_ctx.hw_frames_ctx = av_buffer_ref(hw_frames_ref);
+ 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->iopattern == MFX_IOPATTERN_OUT_OPAQUE_MEMORY);
+ if (ret < 0) {
+ av_buffer_unref(&q->frames_ctx.hw_frames_ctx);
+ return ret;
+ }
+
+ q->session = q->internal_session;
+ } else {
if (!q->internal_session) {
- int ret = ff_qsv_init_internal_session(avctx, &q->internal_session,
- q->load_plugins);
+ ret = ff_qsv_init_internal_session(avctx, &q->internal_session,
+ q->load_plugins);
if (ret < 0)
return ret;
}
q->session = q->internal_session;
- } else {
- q->session = session;
}
/* make sure the decoder is uninitialized */
return 0;
}
-int ff_qsv_decode_init(AVCodecContext *avctx, QSVContext *q, mfxSession session)
+static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q)
{
- mfxVideoParam param = { { 0 } };
+ const AVPixFmtDescriptor *desc;
+ mfxSession session = NULL;
+ int iopattern = 0;
+ mfxVideoParam param = { 0 };
+ int frame_width = avctx->coded_width;
+ int frame_height = avctx->coded_height;
int ret;
+ desc = av_pix_fmt_desc_get(avctx->sw_pix_fmt);
+ if (!desc)
+ return AVERROR_BUG;
+
if (!q->async_fifo) {
q->async_fifo = av_fifo_alloc((1 + q->async_depth) *
- (sizeof(mfxSyncPoint) + sizeof(QSVFrame*)));
+ (sizeof(mfxSyncPoint*) + sizeof(QSVFrame*)));
if (!q->async_fifo)
return AVERROR(ENOMEM);
}
- ret = qsv_init_session(avctx, q, session);
+ if (avctx->pix_fmt == AV_PIX_FMT_QSV && avctx->hwaccel_context) {
+ AVQSVContext *user_ctx = avctx->hwaccel_context;
+ session = user_ctx->session;
+ iopattern = user_ctx->iopattern;
+ q->ext_buffers = user_ctx->ext_buffers;
+ q->nb_ext_buffers = user_ctx->nb_ext_buffers;
+ }
+
+ if (avctx->hw_frames_ctx) {
+ AVHWFramesContext *frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;
+ AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
+
+ if (!iopattern) {
+ if (frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME)
+ iopattern = MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
+ else if (frames_hwctx->frame_type & MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET)
+ iopattern = MFX_IOPATTERN_OUT_VIDEO_MEMORY;
+ }
+
+ frame_width = frames_hwctx->surfaces[0].Info.Width;
+ frame_height = frames_hwctx->surfaces[0].Info.Height;
+ }
+
+ if (!iopattern)
+ iopattern = MFX_IOPATTERN_OUT_SYSTEM_MEMORY;
+ q->iopattern = iopattern;
+
+ ret = qsv_init_session(avctx, q, session, avctx->hw_frames_ctx);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Error initializing an MFX session\n");
return ret;
}
-
ret = ff_qsv_codec_id_to_mfx(avctx->codec_id);
if (ret < 0)
return ret;
param.mfx.CodecId = ret;
- param.mfx.CodecProfile = avctx->profile;
- param.mfx.CodecLevel = avctx->level;
-
- param.mfx.FrameInfo.BitDepthLuma = 8;
- param.mfx.FrameInfo.BitDepthChroma = 8;
- param.mfx.FrameInfo.Shift = 0;
- param.mfx.FrameInfo.FourCC = MFX_FOURCC_NV12;
- param.mfx.FrameInfo.Width = avctx->coded_width;
- param.mfx.FrameInfo.Height = avctx->coded_height;
+ param.mfx.CodecProfile = ff_qsv_profile_to_mfx(avctx->codec_id, avctx->profile);
+ param.mfx.CodecLevel = avctx->level == FF_LEVEL_UNKNOWN ? MFX_LEVEL_UNKNOWN : avctx->level;
+
+ param.mfx.FrameInfo.BitDepthLuma = desc->comp[0].depth;
+ param.mfx.FrameInfo.BitDepthChroma = desc->comp[0].depth;
+ param.mfx.FrameInfo.Shift = desc->comp[0].depth > 8;
+ param.mfx.FrameInfo.FourCC = q->fourcc;
+ param.mfx.FrameInfo.Width = frame_width;
+ param.mfx.FrameInfo.Height = frame_height;
param.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
+ switch (avctx->field_order) {
+ case AV_FIELD_PROGRESSIVE:
+ param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+ break;
+ case AV_FIELD_TT:
+ param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_FIELD_TFF;
+ break;
+ case AV_FIELD_BB:
+ param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_FIELD_BFF;
+ break;
+ default:
+ param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_UNKNOWN;
+ break;
+ }
+
param.IOPattern = q->iopattern;
param.AsyncDepth = q->async_depth;
param.ExtParam = q->ext_buffers;
param.NumExtParam = q->nb_ext_buffers;
ret = MFXVideoDECODE_Init(q->session, ¶m);
- if (ret < 0) {
- av_log(avctx, AV_LOG_ERROR, "Error initializing the MFX video decoder\n");
- return ff_qsv_error(ret);
- }
+ if (ret < 0)
+ return ff_qsv_print_error(avctx, ret,
+ "Error initializing the MFX video decoder");
+
+ q->frame_info = param.mfx.FrameInfo;
return 0;
}
-static int alloc_frame(AVCodecContext *avctx, QSVFrame *frame)
+static int alloc_frame(AVCodecContext *avctx, QSVContext *q, QSVFrame *frame)
{
int ret;
return ret;
if (frame->frame->format == AV_PIX_FMT_QSV) {
- frame->surface = (mfxFrameSurface1*)frame->frame->data[3];
+ frame->surface = *(mfxFrameSurface1*)frame->frame->data[3];
} else {
- frame->surface_internal.Info.BitDepthLuma = 8;
- frame->surface_internal.Info.BitDepthChroma = 8;
- frame->surface_internal.Info.FourCC = MFX_FOURCC_NV12;
- frame->surface_internal.Info.Width = avctx->coded_width;
- frame->surface_internal.Info.Height = avctx->coded_height;
- frame->surface_internal.Info.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-
- frame->surface_internal.Data.PitchLow = frame->frame->linesize[0];
- frame->surface_internal.Data.Y = frame->frame->data[0];
- frame->surface_internal.Data.UV = frame->frame->data[1];
-
- frame->surface = &frame->surface_internal;
+ frame->surface.Info = q->frame_info;
+
+ frame->surface.Data.PitchLow = frame->frame->linesize[0];
+ frame->surface.Data.Y = frame->frame->data[0];
+ frame->surface.Data.UV = frame->frame->data[1];
}
+ if (q->frames_ctx.mids) {
+ ret = ff_qsv_find_surface_idx(&q->frames_ctx, frame);
+ if (ret < 0)
+ return ret;
+
+ frame->surface.Data.MemId = &q->frames_ctx.mids[ret];
+ }
+
+ frame->used = 1;
+
return 0;
}
{
QSVFrame *cur = q->work_frames;
while (cur) {
- if (cur->surface && !cur->surface->Data.Locked && !cur->queued) {
- cur->surface = NULL;
+ if (cur->used && !cur->surface.Data.Locked && !cur->queued) {
+ cur->used = 0;
av_frame_unref(cur->frame);
}
cur = cur->next;
frame = q->work_frames;
last = &q->work_frames;
while (frame) {
- if (!frame->surface) {
- ret = alloc_frame(avctx, frame);
+ if (!frame->used) {
+ ret = alloc_frame(avctx, q, frame);
if (ret < 0)
return ret;
- *surf = frame->surface;
+ *surf = &frame->surface;
return 0;
}
}
*last = frame;
- ret = alloc_frame(avctx, frame);
+ ret = alloc_frame(avctx, q, frame);
if (ret < 0)
return ret;
- *surf = frame->surface;
+ *surf = &frame->surface;
return 0;
}
{
QSVFrame *cur = q->work_frames;
while (cur) {
- if (surf == cur->surface)
+ if (surf == &cur->surface)
return cur;
cur = cur->next;
}
QSVFrame *out_frame;
mfxFrameSurface1 *insurf;
mfxFrameSurface1 *outsurf;
- mfxSyncPoint sync;
+ mfxSyncPoint *sync;
mfxBitstream bs = { { { 0 } } };
int ret;
bs.TimeStamp = avpkt->pts;
}
+ sync = av_mallocz(sizeof(*sync));
+ if (!sync) {
+ av_freep(&sync);
+ return AVERROR(ENOMEM);
+ }
+
do {
ret = get_surface(avctx, q, &insurf);
if (ret < 0)
return ret;
ret = MFXVideoDECODE_DecodeFrameAsync(q->session, avpkt->size ? &bs : NULL,
- insurf, &outsurf, &sync);
+ insurf, &outsurf, sync);
if (ret == MFX_WRN_DEVICE_BUSY)
av_usleep(1);
ret != MFX_ERR_MORE_DATA &&
ret != MFX_WRN_VIDEO_PARAM_CHANGED &&
ret != MFX_ERR_MORE_SURFACE) {
- av_log(avctx, AV_LOG_ERROR, "Error during QSV decoding.\n");
- return ff_qsv_error(ret);
+ av_freep(&sync);
+ return ff_qsv_print_error(avctx, ret,
+ "Error during QSV decoding.");
}
/* make sure we do not enter an infinite loop if the SDK
* did not consume any data and did not return anything */
- if (!sync && !bs.DataOffset) {
- av_log(avctx, AV_LOG_WARNING, "A decode call did not consume any data\n");
+ if (!*sync && !bs.DataOffset) {
bs.DataOffset = avpkt->size;
+ ++q->zero_consume_run;
+ if (q->zero_consume_run > 1)
+ ff_qsv_print_warning(avctx, ret, "A decode call did not consume any data");
+ } else {
+ q->zero_consume_run = 0;
}
- if (sync) {
+ if (*sync) {
QSVFrame *out_frame = find_frame(q, outsurf);
if (!out_frame) {
av_log(avctx, AV_LOG_ERROR,
"The returned surface does not correspond to any frame\n");
+ av_freep(&sync);
return AVERROR_BUG;
}
out_frame->queued = 1;
av_fifo_generic_write(q->async_fifo, &out_frame, sizeof(out_frame), NULL);
av_fifo_generic_write(q->async_fifo, &sync, sizeof(sync), NULL);
+ } else {
+ av_freep(&sync);
}
if (!av_fifo_space(q->async_fifo) ||
av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL);
out_frame->queued = 0;
- MFXVideoCORE_SyncOperation(q->session, sync, 60000);
+ do {
+ ret = MFXVideoCORE_SyncOperation(q->session, *sync, 1000);
+ } while (ret == MFX_WRN_IN_EXECUTION);
+
+ av_freep(&sync);
src_frame = out_frame->frame;
if (ret < 0)
return ret;
- outsurf = out_frame->surface;
+ outsurf = &out_frame->surface;
- frame->pkt_pts = frame->pts = outsurf->Data.TimeStamp;
+#if FF_API_PKT_PTS
+FF_DISABLE_DEPRECATION_WARNINGS
+ frame->pkt_pts = outsurf->Data.TimeStamp;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ frame->pts = outsurf->Data.TimeStamp;
frame->repeat_pict =
outsurf->Info.PicStruct & MFX_PICSTRUCT_FRAME_TRIPLING ? 4 :
frame->interlaced_frame =
!(outsurf->Info.PicStruct & MFX_PICSTRUCT_PROGRESSIVE);
+ /* update the surface properties */
+ if (avctx->pix_fmt == AV_PIX_FMT_QSV)
+ ((mfxFrameSurface1*)frame->data[3])->Info = outsurf->Info;
+
*got_frame = 1;
}
if (q->session)
MFXVideoDECODE_Close(q->session);
+ while (q->async_fifo && av_fifo_size(q->async_fifo)) {
+ QSVFrame *out_frame;
+ mfxSyncPoint *sync;
+
+ av_fifo_generic_read(q->async_fifo, &out_frame, sizeof(out_frame), NULL);
+ av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL);
+
+ av_freep(&sync);
+ }
+
while (cur) {
q->work_frames = cur->next;
av_frame_free(&cur->frame);
if (q->internal_session)
MFXClose(q->internal_session);
+ av_buffer_unref(&q->frames_ctx.hw_frames_ctx);
+ av_buffer_unref(&q->frames_ctx.mids_buf);
+
return 0;
}
if (q->parser->format != q->orig_pix_fmt ||
q->parser->coded_width != avctx->coded_width ||
q->parser->coded_height != avctx->coded_height) {
- mfxSession session = NULL;
-
enum AVPixelFormat pix_fmts[3] = { AV_PIX_FMT_QSV,
AV_PIX_FMT_NONE,
AV_PIX_FMT_NONE };
enum AVPixelFormat qsv_format;
- qsv_format = ff_qsv_map_pixfmt(q->parser->format);
+ qsv_format = ff_qsv_map_pixfmt(q->parser->format, &q->fourcc);
if (qsv_format < 0) {
av_log(avctx, AV_LOG_ERROR,
- "Only 8-bit YUV420 streams are supported.\n");
+ "Decoding pixel format '%s' is not supported\n",
+ av_get_pix_fmt_name(q->parser->format));
ret = AVERROR(ENOSYS);
goto reinit_fail;
}
avctx->height = q->parser->height;
avctx->coded_width = q->parser->coded_width;
avctx->coded_height = q->parser->coded_height;
+ avctx->field_order = q->parser->field_order;
avctx->level = q->avctx_internal->level;
avctx->profile = q->avctx_internal->profile;
avctx->pix_fmt = ret;
- if (avctx->hwaccel_context) {
- AVQSVContext *user_ctx = avctx->hwaccel_context;
- session = user_ctx->session;
- q->iopattern = user_ctx->iopattern;
- q->ext_buffers = user_ctx->ext_buffers;
- q->nb_ext_buffers = user_ctx->nb_ext_buffers;
- }
-
- ret = ff_qsv_decode_init(avctx, q, session);
+ ret = qsv_decode_init(avctx, q);
if (ret < 0)
goto reinit_fail;
}