#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"
static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q)
{
+ const AVPixFmtDescriptor *desc;
mfxSession session = NULL;
int iopattern = 0;
- mfxVideoParam param = { { 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*)));
return AVERROR(ENOMEM);
}
- if (avctx->hwaccel_context) {
+ 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;
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)
return ret;
param.mfx.CodecId = ret;
- param.mfx.CodecProfile = avctx->profile;
- param.mfx.CodecLevel = avctx->level;
+ 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 = 8;
- param.mfx.FrameInfo.BitDepthChroma = 8;
- param.mfx.FrameInfo.Shift = 0;
+ 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 = avctx->coded_width;
- param.mfx.FrameInfo.Height = avctx->coded_height;
+ 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;
}
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");
av_freep(&sync);
- return ff_qsv_error(ret);
+ 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");
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 (ret < 0)
return ret;
- outsurf = out_frame->surface;
+ outsurf = &out_frame->surface;
#if FF_API_PKT_PTS
FF_DISABLE_DEPRECATION_WARNINGS
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;
}
MFXClose(q->internal_session);
av_buffer_unref(&q->frames_ctx.hw_frames_ctx);
- av_freep(&q->frames_ctx.mids);
- q->frames_ctx.nb_mids = 0;
+ av_buffer_unref(&q->frames_ctx.mids_buf);
return 0;
}
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;
projects / ffmpeg / blobdiff