Discussion:
[libav-devel] [PATCH 05/12] lavc: set sw_pix_fmt for hwaccel encoding
Anton Khirnov
2016-07-15 05:19:33 UTC
Permalink
---
libavcodec/utils.c | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index bc1beee..8fe1771 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1113,6 +1113,14 @@ FF_ENABLE_DEPRECATION_WARNINGS
ret = AVERROR(EINVAL);
goto free_and_end;
}
+ if (avctx->sw_pix_fmt != AV_PIX_FMT_NONE &&
+ avctx->sw_pix_fmt != frames_ctx->sw_format) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Mismatching AVCodecContext.sw_pix_fmt and AVHWFramesContext.sw_format\n");
+ ret = AVERROR(EINVAL);
+ goto free_and_end;
+ }
+ avctx->sw_pix_fmt = frames_ctx->sw_format;
}
}
--
2.0.0
Anton Khirnov
2016-07-15 05:19:34 UTC
Permalink
This will allow using this function for encoding as well, where the
input format is already the semi-packed version.
---
libavcodec/qsv.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 5f7653a..c8b3978 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -94,9 +94,11 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc)
switch (format) {
case AV_PIX_FMT_YUV420P:
case AV_PIX_FMT_YUVJ420P:
+ case AV_PIX_FMT_NV12:
*fourcc = MFX_FOURCC_NV12;
return AV_PIX_FMT_NV12;
case AV_PIX_FMT_YUV420P10:
+ case AV_PIX_FMT_P010:
*fourcc = MFX_FOURCC_P010;
return AV_PIX_FMT_P010;
default:
--
2.0.0
Luca Barbato
2016-07-15 13:33:25 UTC
Permalink
Post by Anton Khirnov
This will allow using this function for encoding as well, where the
input format is already the semi-packed version.
---
libavcodec/qsv.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 5f7653a..c8b3978 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -94,9 +94,11 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc)
switch (format) {
*fourcc = MFX_FOURCC_NV12;
return AV_PIX_FMT_NV12;
*fourcc = MFX_FOURCC_P010;
return AV_PIX_FMT_P010;
Sounds ok.
Anton Khirnov
2016-07-15 05:19:38 UTC
Permalink
It should only be done for DEVICE_BUSY/IN_EXECUTION
---
libavcodec/qsvenc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index fbbe23c..4697e1d 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -972,7 +972,7 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q,
ret = MFXVideoENCODE_EncodeFrameAsync(q->session, NULL, surf, bs, sync);
if (ret == MFX_WRN_DEVICE_BUSY)
av_usleep(1);
- } while (ret > 0);
+ } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION);

if (ret < 0) {
av_packet_unref(&new_pkt);
--
2.0.0
Luca Barbato
2016-07-15 13:37:05 UTC
Permalink
Post by Anton Khirnov
It should only be done for DEVICE_BUSY/IN_EXECUTION
---
libavcodec/qsvenc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index fbbe23c..4697e1d 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -972,7 +972,7 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q,
ret = MFXVideoENCODE_EncodeFrameAsync(q->session, NULL, surf, bs, sync);
if (ret == MFX_WRN_DEVICE_BUSY)
av_usleep(1);
- } while (ret > 0);
+ } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION);
if (ret < 0) {
av_packet_unref(&new_pkt);
Possibly ok.
Anton Khirnov
2016-07-15 05:19:30 UTC
Permalink
This is required e.g. by HEVC.
---
avconv_qsv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/avconv_qsv.c b/avconv_qsv.c
index 8272f17..400cf22 100644
--- a/avconv_qsv.c
+++ b/avconv_qsv.c
@@ -76,8 +76,8 @@ int qsv_init(AVCodecContext *s)
frames_ctx = (AVHWFramesContext*)ist->hw_frames_ctx->data;
frames_hwctx = frames_ctx->hwctx;

- frames_ctx->width = s->coded_width;
- frames_ctx->height = s->coded_height;
+ frames_ctx->width = FFALIGN(s->coded_width, 32);
+ frames_ctx->height = FFALIGN(s->coded_height, 32);
frames_ctx->format = AV_PIX_FMT_QSV;
frames_ctx->sw_format = AV_PIX_FMT_NV12;
frames_ctx->initial_pool_size = 32;
--
2.0.0
Luca Barbato
2016-07-15 13:22:42 UTC
Permalink
Post by Anton Khirnov
This is required e.g. by HEVC.
---
avconv_qsv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/avconv_qsv.c b/avconv_qsv.c
index 8272f17..400cf22 100644
--- a/avconv_qsv.c
+++ b/avconv_qsv.c
@@ -76,8 +76,8 @@ int qsv_init(AVCodecContext *s)
frames_ctx = (AVHWFramesContext*)ist->hw_frames_ctx->data;
frames_hwctx = frames_ctx->hwctx;
- frames_ctx->width = s->coded_width;
- frames_ctx->height = s->coded_height;
+ frames_ctx->width = FFALIGN(s->coded_width, 32);
+ frames_ctx->height = FFALIGN(s->coded_height, 32);
frames_ctx->format = AV_PIX_FMT_QSV;
frames_ctx->sw_format = AV_PIX_FMT_NV12;
frames_ctx->initial_pool_size = 32;
Ok.
Anton Khirnov
2016-07-15 05:19:32 UTC
Permalink
Currently it's memset to 0, which is YUV420P. It should be initialized
to none.
---
libavcodec/options.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/libavcodec/options.c b/libavcodec/options.c
index 18613ac..00921fb 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -98,6 +98,7 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec)
s->execute2 = avcodec_default_execute2;
s->sample_aspect_ratio = (AVRational){0,1};
s->pix_fmt = AV_PIX_FMT_NONE;
+ s->sw_pix_fmt = AV_PIX_FMT_NONE;
s->sample_fmt = AV_SAMPLE_FMT_NONE;

s->reordered_opaque = AV_NOPTS_VALUE;
--
2.0.0
Luca Barbato
2016-07-15 13:40:26 UTC
Permalink
Post by Anton Khirnov
Currently it's memset to 0, which is YUV420P. It should be initialized
to none.
---
libavcodec/options.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 18613ac..00921fb 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -98,6 +98,7 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec)
s->execute2 = avcodec_default_execute2;
s->sample_aspect_ratio = (AVRational){0,1};
s->pix_fmt = AV_PIX_FMT_NONE;
+ s->sw_pix_fmt = AV_PIX_FMT_NONE;
s->sample_fmt = AV_SAMPLE_FMT_NONE;
s->reordered_opaque = AV_NOPTS_VALUE;
Ok.
Anton Khirnov
2016-07-15 05:19:36 UTC
Permalink
Other parameters, like the display size, should still be taken from the
codec context.
---
libavcodec/qsvenc.c | 50 +++++++++++++++++++++++++-------------------------
1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index e28f354..cd321d3 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -355,6 +355,9 @@ static int rc_supported(QSVEncContext *q)

static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
{
+ enum AVPixelFormat sw_format = avctx->pix_fmt == AV_PIX_FMT_QSV ?
+ avctx->sw_pix_fmt : avctx->pix_fmt;
+ const AVPixFmtDescriptor *desc;
float quant;
int ret;

@@ -380,34 +383,31 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
q->param.mfx.EncodedOrder = 0;
q->param.mfx.BufferSizeInKB = 0;

+ desc = av_pix_fmt_desc_get(sw_format);
+ if (!desc)
+ return AVERROR_BUG;
+
+ ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC);
+
+ q->param.mfx.FrameInfo.Width = FFALIGN(avctx->width, q->width_align);
+ q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, 32);
+ q->param.mfx.FrameInfo.CropX = 0;
+ q->param.mfx.FrameInfo.CropY = 0;
+ q->param.mfx.FrameInfo.CropW = avctx->width;
+ q->param.mfx.FrameInfo.CropH = avctx->height;
+ q->param.mfx.FrameInfo.AspectRatioW = avctx->sample_aspect_ratio.num;
+ q->param.mfx.FrameInfo.AspectRatioH = avctx->sample_aspect_ratio.den;
+ q->param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+ q->param.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
+ q->param.mfx.FrameInfo.BitDepthLuma = desc->comp[0].depth;
+ q->param.mfx.FrameInfo.BitDepthChroma = desc->comp[0].depth;
+ q->param.mfx.FrameInfo.Shift = desc->comp[0].depth > 8;
+
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 {
- enum AVPixelFormat sw_format = avctx->pix_fmt == AV_PIX_FMT_QSV ?
- avctx->sw_pix_fmt : avctx->pix_fmt;
- const AVPixFmtDescriptor *desc;
-
- desc = av_pix_fmt_desc_get(sw_format);
- if (!desc)
- return AVERROR_BUG;
-
- ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC);
-
- q->param.mfx.FrameInfo.Width = FFALIGN(avctx->width, q->width_align);
- q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, 32);
- q->param.mfx.FrameInfo.CropX = 0;
- q->param.mfx.FrameInfo.CropY = 0;
- q->param.mfx.FrameInfo.CropW = avctx->width;
- q->param.mfx.FrameInfo.CropH = avctx->height;
- q->param.mfx.FrameInfo.AspectRatioW = avctx->sample_aspect_ratio.num;
- q->param.mfx.FrameInfo.AspectRatioH = avctx->sample_aspect_ratio.den;
- q->param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
- q->param.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
- q->param.mfx.FrameInfo.BitDepthLuma = desc->comp[0].depth;
- q->param.mfx.FrameInfo.BitDepthChroma = desc->comp[0].depth;
- q->param.mfx.FrameInfo.Shift = desc->comp[0].depth > 8;
+ q->param.mfx.FrameInfo.Width = frames_hwctx->surfaces[0].Info.Width;
+ q->param.mfx.FrameInfo.Height = frames_hwctx->surfaces[0].Info.Height;
}

if (avctx->framerate.den > 0 && avctx->framerate.num > 0) {
--
2.0.0
Anton Khirnov
2016-07-15 05:19:37 UTC
Permalink
Include the libmfx error code and its description
---
libavcodec/qsv.c | 133 +++++++++++++++++++++++++++-------------------
libavcodec/qsv_internal.h | 5 +-
libavcodec/qsvdec.c | 11 ++--
libavcodec/qsvenc.c | 20 +++----
4 files changed, 97 insertions(+), 72 deletions(-)

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index c8b3978..14f16bc 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -54,39 +54,67 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id)
return AVERROR(ENOSYS);
}

-int ff_qsv_error(int mfx_err)
+static const struct {
+ mfxStatus mfxerr;
+ int averr;
+ const char *desc;
+} qsv_errors[] = {
+ { MFX_ERR_NONE, 0, "success" },
+ { MFX_ERR_UNKNOWN, AVERROR_UNKNOWN, "unknown error" },
+ { MFX_ERR_NULL_PTR, AVERROR(EINVAL), "NULL pointer" },
+ { MFX_ERR_UNSUPPORTED, AVERROR(ENOSYS), "unsupported" },
+ { MFX_ERR_MEMORY_ALLOC, AVERROR(ENOMEM), "failed to allocate memory" },
+ { MFX_ERR_NOT_ENOUGH_BUFFER, AVERROR(ENOMEM), "insufficient input/output buffer" },
+ { MFX_ERR_INVALID_HANDLE, AVERROR(EINVAL), "invalid handle" },
+ { MFX_ERR_LOCK_MEMORY, AVERROR(EIO), "failed to lock the memory block" },
+ { MFX_ERR_NOT_INITIALIZED, AVERROR_BUG, "not initialized" },
+ { MFX_ERR_NOT_FOUND, AVERROR(ENOSYS), "specified object was not found" },
+ { MFX_ERR_MORE_DATA, AVERROR(EAGAIN), "expect more data at input" },
+ { MFX_ERR_MORE_SURFACE, AVERROR(EAGAIN), "expect more surface at output" },
+ { MFX_ERR_ABORTED, AVERROR_UNKNOWN, "operation aborted" },
+ { MFX_ERR_DEVICE_LOST, AVERROR(EIO), "device lost" },
+ { MFX_ERR_INCOMPATIBLE_VIDEO_PARAM, AVERROR(EINVAL), "incompatible video parameters" },
+ { MFX_ERR_INVALID_VIDEO_PARAM, AVERROR(EINVAL), "invalid video parameters" },
+ { MFX_ERR_UNDEFINED_BEHAVIOR, AVERROR_BUG, "undefined behavior" },
+ { MFX_ERR_DEVICE_FAILED, AVERROR(EIO), "device failed" },
+ { MFX_ERR_MORE_BITSTREAM, AVERROR(EAGAIN), "expect more bitstream at output" },
+ { MFX_ERR_INCOMPATIBLE_AUDIO_PARAM, AVERROR(EINVAL), "incompatible audio parameters" },
+ { MFX_ERR_INVALID_AUDIO_PARAM, AVERROR(EINVAL), "invalid audio parameters" },
+
+ { MFX_WRN_IN_EXECUTION, 0, "operation in execution" },
+ { MFX_WRN_DEVICE_BUSY, 0, "device busy" },
+ { MFX_WRN_VIDEO_PARAM_CHANGED, 0, "video parameters changed" },
+ { MFX_WRN_PARTIAL_ACCELERATION, 0, "partial acceleration" },
+ { MFX_WRN_INCOMPATIBLE_VIDEO_PARAM, 0, "incompatible video parameters" },
+ { MFX_WRN_VALUE_NOT_CHANGED, 0, "value is saturated" },
+ { MFX_WRN_OUT_OF_RANGE, 0, "value out of range" },
+ { MFX_WRN_FILTER_SKIPPED, 0, "filter skipped" },
+ { MFX_WRN_INCOMPATIBLE_AUDIO_PARAM, 0, "incompatible audio parameters" },
+};
+
+int ff_qsv_map_error(mfxStatus mfx_err, const char **desc)
{
- switch (mfx_err) {
- case MFX_ERR_NONE:
- return 0;
- case MFX_ERR_MEMORY_ALLOC:
- case MFX_ERR_NOT_ENOUGH_BUFFER:
- return AVERROR(ENOMEM);
- case MFX_ERR_INVALID_HANDLE:
- return AVERROR(EINVAL);
- case MFX_ERR_DEVICE_FAILED:
- case MFX_ERR_DEVICE_LOST:
- case MFX_ERR_LOCK_MEMORY:
- return AVERROR(EIO);
- case MFX_ERR_NULL_PTR:
- case MFX_ERR_UNDEFINED_BEHAVIOR:
- case MFX_ERR_NOT_INITIALIZED:
- return AVERROR_BUG;
- case MFX_ERR_UNSUPPORTED:
- case MFX_ERR_NOT_FOUND:
- return AVERROR(ENOSYS);
- case MFX_ERR_MORE_DATA:
- case MFX_ERR_MORE_SURFACE:
- case MFX_ERR_MORE_BITSTREAM:
- return AVERROR(EAGAIN);
- case MFX_ERR_INCOMPATIBLE_VIDEO_PARAM:
- case MFX_ERR_INVALID_VIDEO_PARAM:
- return AVERROR(EINVAL);
- case MFX_ERR_ABORTED:
- case MFX_ERR_UNKNOWN:
- default:
- return AVERROR_UNKNOWN;
+ int i;
+ for (i = 0; i < FF_ARRAY_ELEMS(qsv_errors); i++) {
+ if (qsv_errors[i].mfxerr == mfx_err) {
+ if (desc)
+ *desc = qsv_errors[i].desc;
+ return qsv_errors[i].averr;
+ }
}
+ if (desc)
+ *desc = "unknown error";
+ return AVERROR_UNKNOWN;
+}
+
+int ff_qsv_print_error(void *log_ctx, mfxStatus err,
+ const char *error_string)
+{
+ const char *desc;
+ int ret;
+ ret = ff_qsv_map_error(err, &desc);
+ av_log(log_ctx, AV_LOG_ERROR, "%s: %s (%d)\n", error_string, desc, err);
+ return ret;
}

int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc)
@@ -138,9 +166,10 @@ static int qsv_load_plugins(mfxSession session, const char *load_plugins,

ret = MFXVideoUSER_Load(session, &uid, 1);
if (ret < 0) {
- av_log(logctx, AV_LOG_ERROR, "Could not load the requested plugin: %s\n",
- plugin);
- err = ff_qsv_error(ret);
+ char errorbuf[128];
+ snprintf(errorbuf, sizeof(errorbuf),
+ "Could not load the requested plugin '%s'", plugin);
+ err = ff_qsv_print_error(logctx, ret, errorbuf);
goto load_plugin_fail;
}

@@ -166,10 +195,9 @@ int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session,
int ret;

ret = MFXInit(impl, &ver, session);
- if (ret < 0) {
- av_log(avctx, AV_LOG_ERROR, "Error initializing an internal MFX session\n");
- return ff_qsv_error(ret);
- }
+ if (ret < 0)
+ return ff_qsv_print_error(avctx, ret,
+ "Error initializing an internal MFX session");

ret = qsv_load_plugins(*session, load_plugins, avctx);
if (ret < 0) {
@@ -282,10 +310,9 @@ int ff_qsv_init_session_hwcontext(AVCodecContext *avctx, mfxSession *psession,
err = MFXQueryIMPL(parent_session, &impl);
if (err == MFX_ERR_NONE)
err = MFXQueryVersion(parent_session, &ver);
- if (err != MFX_ERR_NONE) {
- av_log(avctx, AV_LOG_ERROR, "Error querying the session attributes\n");
- return ff_qsv_error(err);
- }
+ if (err != MFX_ERR_NONE)
+ return ff_qsv_print_error(avctx, err,
+ "Error querying the session attributes");

for (i = 0; i < FF_ARRAY_ELEMS(handle_types); i++) {
err = MFXVideoCORE_GetHandle(parent_session, handle_types[i], &handle);
@@ -301,18 +328,15 @@ int ff_qsv_init_session_hwcontext(AVCodecContext *avctx, mfxSession *psession,
}

err = MFXInit(impl, &ver, &session);
- if (err != MFX_ERR_NONE) {
- av_log(avctx, AV_LOG_ERROR,
- "Error initializing a child MFX session: %d\n", err);
- return ff_qsv_error(err);
- }
+ if (err != MFX_ERR_NONE)
+ return ff_qsv_print_error(avctx, err,
+ "Error initializing a child MFX session");

if (handle) {
err = MFXVideoCORE_SetHandle(session, handle_type, handle);
- if (err != MFX_ERR_NONE) {
- av_log(avctx, AV_LOG_ERROR, "Error setting a HW handle: %d\n", err);
- return ff_qsv_error(err);
- }
+ if (err != MFX_ERR_NONE)
+ return ff_qsv_print_error(avctx, err,
+ "Error setting a HW handle");
}

ret = qsv_load_plugins(session, load_plugins, avctx);
@@ -334,10 +358,9 @@ int ff_qsv_init_session_hwcontext(AVCodecContext *avctx, mfxSession *psession,
qsv_frames_ctx->mids[i] = frames_hwctx->surfaces[i].Data.MemId;

err = MFXVideoCORE_SetFrameAllocator(session, &frame_allocator);
- if (err != MFX_ERR_NONE) {
- av_log(avctx, AV_LOG_ERROR, "Error setting a frame allocator: %d\n", err);
- return ff_qsv_error(err);
- }
+ if (err != MFX_ERR_NONE)
+ return ff_qsv_print_error(avctx, err,
+ "Error setting a frame allocator");
}

*psession = session;
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
index e865741..03b2f65 100644
--- a/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@ -57,7 +57,10 @@ typedef struct QSVFramesContext {
/**
* Convert a libmfx error code into a libav error code.
*/
-int ff_qsv_error(int mfx_err);
+int ff_qsv_map_error(mfxStatus mfx_err, const char **desc);
+
+int ff_qsv_print_error(void *log_ctx, mfxStatus err,
+ const char *error_string);

int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id);

diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 5b36489..4802932 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -161,10 +161,9 @@ static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q)
param.NumExtParam = q->nb_ext_buffers;

ret = MFXVideoDECODE_Init(q->session, &param);
- 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;

@@ -298,9 +297,9 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q,
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
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index cd321d3..fbbe23c 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -601,7 +601,8 @@ static int qsv_retrieve_enc_params(AVCodecContext *avctx, QSVEncContext *q)

ret = MFXVideoENCODE_GetVideoParam(q->session, &q->param);
if (ret < 0)
- return ff_qsv_error(ret);
+ return ff_qsv_print_error(avctx, ret,
+ "Error calling GetVideoParam");

q->packet_size = q->param.mfx.BufferSizeInKB * 1000;

@@ -750,10 +751,9 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
return ret;

ret = MFXVideoENCODE_QueryIOSurf(q->session, &q->param, &q->req);
- if (ret < 0) {
- av_log(avctx, AV_LOG_ERROR, "Error querying the encoding parameters\n");
- return ff_qsv_error(ret);
- }
+ if (ret < 0)
+ return ff_qsv_print_error(avctx, ret,
+ "Error querying the encoding parameters");

if (opaque_alloc) {
ret = qsv_init_opaque_alloc(avctx, q);
@@ -791,10 +791,9 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
}

ret = MFXVideoENCODE_Init(q->session, &q->param);
- if (ret < 0) {
- av_log(avctx, AV_LOG_ERROR, "Error initializing the encoder\n");
- return ff_qsv_error(ret);
- }
+ if (ret < 0)
+ return ff_qsv_print_error(avctx, ret,
+ "Error initializing the encoder");

ret = qsv_retrieve_enc_params(avctx, q);
if (ret < 0) {
@@ -979,7 +978,8 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q,
av_packet_unref(&new_pkt);
av_freep(&bs);
av_freep(&sync);
- return (ret == MFX_ERR_MORE_DATA) ? 0 : ff_qsv_error(ret);
+ return (ret == MFX_ERR_MORE_DATA) ?
+ 0 : ff_qsv_print_error(avctx, ret, "Error during encoding");
}

if (ret == MFX_WRN_INCOMPATIBLE_VIDEO_PARAM && frame->interlaced_frame)
--
2.0.0
Luca Barbato
2016-07-15 13:36:35 UTC
Permalink
Post by Anton Khirnov
Include the libmfx error code and its description
---
libavcodec/qsv.c | 133 +++++++++++++++++++++++++++-------------------
libavcodec/qsv_internal.h | 5 +-
libavcodec/qsvdec.c | 11 ++--
libavcodec/qsvenc.c | 20 +++----
4 files changed, 97 insertions(+), 72 deletions(-)
Nice!
Anton Khirnov
2016-07-15 05:19:31 UTC
Permalink
Do not hardcode NV12. This allows 10bit decoding with -hwaccel qsv.
---
avconv_qsv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avconv_qsv.c b/avconv_qsv.c
index 400cf22..723c6e0 100644
--- a/avconv_qsv.c
+++ b/avconv_qsv.c
@@ -79,7 +79,7 @@ int qsv_init(AVCodecContext *s)
frames_ctx->width = FFALIGN(s->coded_width, 32);
frames_ctx->height = FFALIGN(s->coded_height, 32);
frames_ctx->format = AV_PIX_FMT_QSV;
- frames_ctx->sw_format = AV_PIX_FMT_NV12;
+ frames_ctx->sw_format = s->sw_pix_fmt;
frames_ctx->initial_pool_size = 32;
frames_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
--
2.0.0
Luca Barbato
2016-07-15 13:22:57 UTC
Permalink
Post by Anton Khirnov
Do not hardcode NV12. This allows 10bit decoding with -hwaccel qsv.
---
avconv_qsv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/avconv_qsv.c b/avconv_qsv.c
index 400cf22..723c6e0 100644
--- a/avconv_qsv.c
+++ b/avconv_qsv.c
@@ -79,7 +79,7 @@ int qsv_init(AVCodecContext *s)
frames_ctx->width = FFALIGN(s->coded_width, 32);
frames_ctx->height = FFALIGN(s->coded_height, 32);
frames_ctx->format = AV_PIX_FMT_QSV;
- frames_ctx->sw_format = AV_PIX_FMT_NV12;
+ frames_ctx->sw_format = s->sw_pix_fmt;
frames_ctx->initial_pool_size = 32;
frames_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
Sure.
Anton Khirnov
2016-07-15 05:19:39 UTC
Permalink
---
libavcodec/qsv.c | 10 ++++++++++
libavcodec/qsv_internal.h | 3 +++
libavcodec/qsvenc.c | 6 ++++++
3 files changed, 19 insertions(+)

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 14f16bc..9119586 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -117,6 +117,16 @@ int ff_qsv_print_error(void *log_ctx, mfxStatus err,
return ret;
}

+int ff_qsv_print_warning(void *log_ctx, mfxStatus err,
+ const char *warning_string)
+{
+ const char *desc;
+ int ret;
+ ret = ff_qsv_map_error(err, &desc);
+ av_log(log_ctx, AV_LOG_WARNING, "%s: %s (%d)\n", warning_string, desc, err);
+ return ret;
+}
+
int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc)
{
switch (format) {
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
index 03b2f65..41f4c3d 100644
--- a/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@ -62,6 +62,9 @@ int ff_qsv_map_error(mfxStatus mfx_err, const char **desc);
int ff_qsv_print_error(void *log_ctx, mfxStatus err,
const char *error_string);

+int ff_qsv_print_warning(void *log_ctx, mfxStatus err,
+ const char *warning_string);
+
int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id);

int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc);
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 4697e1d..ba07db6 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -794,6 +794,9 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
if (ret < 0)
return ff_qsv_print_error(avctx, ret,
"Error initializing the encoder");
+ else if (ret > 0)
+ ff_qsv_print_warning(avctx, ret,
+ "Warning in encoder initialization");

ret = qsv_retrieve_enc_params(avctx, q);
if (ret < 0) {
@@ -974,6 +977,9 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q,
av_usleep(1);
} while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION);

+ if (ret > 0)
+ ff_qsv_print_warning(avctx, ret, "Warning during encoding");
+
if (ret < 0) {
av_packet_unref(&new_pkt);
av_freep(&bs);
--
2.0.0
Luca Barbato
2016-07-15 13:37:27 UTC
Permalink
Post by Anton Khirnov
---
libavcodec/qsv.c | 10 ++++++++++
libavcodec/qsv_internal.h | 3 +++
libavcodec/qsvenc.c | 6 ++++++
3 files changed, 19 insertions(+)
Ok.
Anton Khirnov
2016-07-15 05:19:35 UTC
Permalink
---
libavcodec/qsvenc.c | 16 +++++++++++++---
libavcodec/qsvenc_h264.c | 1 +
libavcodec/qsvenc_hevc.c | 1 +
3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 2bb7a1d..e28f354 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -385,7 +385,16 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
q->param.mfx.FrameInfo = frames_hwctx->surfaces[0].Info;
} else {
- q->param.mfx.FrameInfo.FourCC = MFX_FOURCC_NV12;
+ enum AVPixelFormat sw_format = avctx->pix_fmt == AV_PIX_FMT_QSV ?
+ avctx->sw_pix_fmt : avctx->pix_fmt;
+ const AVPixFmtDescriptor *desc;
+
+ desc = av_pix_fmt_desc_get(sw_format);
+ if (!desc)
+ return AVERROR_BUG;
+
+ ff_qsv_map_pixfmt(sw_format, &q->param.mfx.FrameInfo.FourCC);
+
q->param.mfx.FrameInfo.Width = FFALIGN(avctx->width, q->width_align);
q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, 32);
q->param.mfx.FrameInfo.CropX = 0;
@@ -396,8 +405,9 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
q->param.mfx.FrameInfo.AspectRatioH = avctx->sample_aspect_ratio.den;
q->param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
q->param.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
- q->param.mfx.FrameInfo.BitDepthLuma = 8;
- q->param.mfx.FrameInfo.BitDepthChroma = 8;
+ q->param.mfx.FrameInfo.BitDepthLuma = desc->comp[0].depth;
+ q->param.mfx.FrameInfo.BitDepthChroma = desc->comp[0].depth;
+ q->param.mfx.FrameInfo.Shift = desc->comp[0].depth > 8;
}

if (avctx->framerate.den > 0 && avctx->framerate.num > 0) {
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index fc4e0b2..a968dcf 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -126,6 +126,7 @@ AVCodec ff_h264_qsv_encoder = {
.close = qsv_enc_close,
.capabilities = AV_CODEC_CAP_DELAY,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12,
+ AV_PIX_FMT_P010,
AV_PIX_FMT_QSV,
AV_PIX_FMT_NONE },
.priv_class = &class,
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
index 706191d..ddb2a42 100644
--- a/libavcodec/qsvenc_hevc.c
+++ b/libavcodec/qsvenc_hevc.c
@@ -262,6 +262,7 @@ AVCodec ff_hevc_qsv_encoder = {
.close = qsv_enc_close,
.capabilities = AV_CODEC_CAP_DELAY,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12,
+ AV_PIX_FMT_P010,
AV_PIX_FMT_QSV,
AV_PIX_FMT_NONE },
.priv_class = &class,
--
2.0.0
Luca Barbato
2016-07-15 13:33:46 UTC
Permalink
Post by Anton Khirnov
---
libavcodec/qsvenc.c | 16 +++++++++++++---
libavcodec/qsvenc_h264.c | 1 +
libavcodec/qsvenc_hevc.c | 1 +
3 files changed, 15 insertions(+), 3 deletions(-)
Ok.
Anton Khirnov
2016-07-15 05:19:40 UTC
Permalink
---
Changelog | 2 +-
configure | 1 +
libavfilter/Makefile | 1 +
libavfilter/allfilters.c | 1 +
libavfilter/vf_deinterlace_qsv.c | 580 +++++++++++++++++++++++++++++++++++++++
5 files changed, 584 insertions(+), 1 deletion(-)
create mode 100644 libavfilter/vf_deinterlace_qsv.c

diff --git a/Changelog b/Changelog
index b21f447..d3201b3 100644
--- a/Changelog
+++ b/Changelog
@@ -59,7 +59,7 @@ version <next>:
- G.729 raw demuxer
- MagicYUV decoder
- Duck TrueMotion 2.0 Real Time decoder
-- Intel QSV video scaling filter
+- Intel QSV video scaling and deinterlacing filter
- OpenH264 decoder wrapper


diff --git a/configure b/configure
index 4b122e9..1ab671d 100755
--- a/configure
+++ b/configure
@@ -2401,6 +2401,7 @@ blackframe_filter_deps="gpl"
boxblur_filter_deps="gpl"
bs2b_filter_deps="libbs2b"
cropdetect_filter_deps="gpl"
+deinterlace_qsv_filter_deps="libmfx"
delogo_filter_deps="gpl"
drawtext_filter_deps="libfreetype"
frei0r_filter_deps="frei0r dlopen"
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 21515fe..dea8ffa 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -47,6 +47,7 @@ OBJS-$(CONFIG_BOXBLUR_FILTER) += vf_boxblur.o
OBJS-$(CONFIG_COPY_FILTER) += vf_copy.o
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.o
+OBJS-$(CONFIG_DEINTERLACE_QSV_FILTER) += vf_deinterlace_qsv.o
OBJS-$(CONFIG_DELOGO_FILTER) += vf_delogo.o
OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o
OBJS-$(CONFIG_DRAWTEXT_FILTER) += vf_drawtext.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index e3858d8..de49d65 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -70,6 +70,7 @@ void avfilter_register_all(void)
REGISTER_FILTER(COPY, copy, vf);
REGISTER_FILTER(CROP, crop, vf);
REGISTER_FILTER(CROPDETECT, cropdetect, vf);
+ REGISTER_FILTER(DEINTERLACE_QSV,deinterlace_qsv,vf);
REGISTER_FILTER(DELOGO, delogo, vf);
REGISTER_FILTER(DRAWBOX, drawbox, vf);
REGISTER_FILTER(DRAWTEXT, drawtext, vf);
diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c
new file mode 100644
index 0000000..b26a900
--- /dev/null
+++ b/libavfilter/vf_deinterlace_qsv.c
@@ -0,0 +1,580 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * deinterlace video filter - QSV
+ */
+
+#include <mfx/mfxvideo.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include "libavutil/avstring.h"
+#include "libavutil/common.h"
+#include "libavutil/hwcontext.h"
+#include "libavutil/hwcontext_qsv.h"
+#include "libavutil/internal.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/time.h"
+
+#include "avfilter.h"
+#include "formats.h"
+#include "internal.h"
+#include "video.h"
+
+enum {
+ QSVDEINT_MORE_OUTPUT = 1,
+ QSVDEINT_MORE_INPUT,
+};
+
+typedef struct QSVFrame {
+ AVFrame *frame;
+ mfxFrameSurface1 surface;
+ int used;
+
+ struct QSVFrame *next;
+} QSVFrame;
+
+typedef struct QSVDeintContext {
+ const AVClass *class;
+
+ AVBufferRef *hw_frames_ctx;
+ /* a clone of the main session, used internally for deinterlacing */
+ mfxSession session;
+
+ mfxMemId *mem_ids;
+ int nb_mem_ids;
+
+ mfxFrameSurface1 **surface_ptrs;
+ int nb_surface_ptrs;
+
+ mfxExtOpaqueSurfaceAlloc opaque_alloc;
+ mfxExtBuffer *ext_buffers[1];
+
+ QSVFrame *work_frames;
+
+ int64_t last_pts;
+
+ int got_output_frame;
+ int eof;
+} QSVDeintContext;
+
+static void qsvdeint_uninit(AVFilterContext *ctx)
+{
+ QSVDeintContext *s = ctx->priv;
+ QSVFrame *cur;
+
+ if (s->session) {
+ MFXClose(s->session);
+ s->session = NULL;
+ }
+ av_buffer_unref(&s->hw_frames_ctx);
+
+ cur = s->work_frames;
+ while (cur) {
+ s->work_frames = cur->next;
+ av_frame_free(&cur->frame);
+ av_freep(&cur);
+ cur = s->work_frames;
+ }
+
+ av_freep(&s->mem_ids);
+ s->nb_mem_ids = 0;
+
+ av_freep(&s->surface_ptrs);
+ s->nb_surface_ptrs = 0;
+}
+
+static int qsvdeint_query_formats(AVFilterContext *ctx)
+{
+ static const enum AVPixelFormat pixel_formats[] = {
+ AV_PIX_FMT_QSV, AV_PIX_FMT_NONE,
+ };
+ AVFilterFormats *pix_fmts = ff_make_format_list(pixel_formats);
+
+ ff_set_common_formats(ctx, pix_fmts);
+
+ return 0;
+}
+
+static mfxStatus frame_alloc(mfxHDL pthis, mfxFrameAllocRequest *req,
+ mfxFrameAllocResponse *resp)
+{
+ AVFilterContext *ctx = pthis;
+ QSVDeintContext *s = ctx->priv;
+
+ if (!(req->Type & MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET) ||
+ !(req->Type & (MFX_MEMTYPE_FROM_VPPIN | MFX_MEMTYPE_FROM_VPPOUT)) ||
+ !(req->Type & MFX_MEMTYPE_EXTERNAL_FRAME))
+ return MFX_ERR_UNSUPPORTED;
+
+ resp->mids = s->mem_ids;
+ resp->NumFrameActual = s->nb_mem_ids;
+
+ return MFX_ERR_NONE;
+}
+
+static mfxStatus frame_free(mfxHDL pthis, mfxFrameAllocResponse *resp)
+{
+ return MFX_ERR_NONE;
+}
+
+static mfxStatus frame_lock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
+{
+ return MFX_ERR_UNSUPPORTED;
+}
+
+static mfxStatus frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
+{
+ return MFX_ERR_UNSUPPORTED;
+}
+
+static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
+{
+ *hdl = mid;
+ return MFX_ERR_NONE;
+}
+
+static const mfxHandleType handle_types[] = {
+ MFX_HANDLE_VA_DISPLAY,
+ MFX_HANDLE_D3D9_DEVICE_MANAGER,
+ MFX_HANDLE_D3D11_DEVICE,
+};
+
+static int init_out_session(AVFilterContext *ctx)
+{
+
+ QSVDeintContext *s = ctx->priv;
+ AVHWFramesContext *hw_frames_ctx = (AVHWFramesContext*)s->hw_frames_ctx->data;
+ AVQSVFramesContext *hw_frames_hwctx = hw_frames_ctx->hwctx;
+ AVQSVDeviceContext *device_hwctx = hw_frames_ctx->device_ctx->hwctx;
+
+ int opaque = !!(hw_frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME);
+
+ mfxHDL handle = NULL;
+ mfxHandleType handle_type;
+ mfxVersion ver;
+ mfxIMPL impl;
+ mfxVideoParam par;
+ mfxStatus err;
+ int i;
+
+ /* extract the properties of the "master" session given to us */
+ err = MFXQueryIMPL(device_hwctx->session, &impl);
+ if (err == MFX_ERR_NONE)
+ err = MFXQueryVersion(device_hwctx->session, &ver);
+ if (err != MFX_ERR_NONE) {
+ av_log(ctx, AV_LOG_ERROR, "Error querying the session attributes\n");
+ return AVERROR_UNKNOWN;
+ }
+
+ for (i = 0; i < FF_ARRAY_ELEMS(handle_types); i++) {
+ err = MFXVideoCORE_GetHandle(device_hwctx->session, handle_types[i], &handle);
+ if (err == MFX_ERR_NONE) {
+ handle_type = handle_types[i];
+ break;
+ }
+ }
+
+ /* create a "slave" session with those same properties, to be used for
+ * actual deinterlacing */
+ err = MFXInit(impl, &ver, &s->session);
+ if (err != MFX_ERR_NONE) {
+ av_log(ctx, AV_LOG_ERROR, "Error initializing a session for deinterlacing\n");
+ return AVERROR_UNKNOWN;
+ }
+
+ if (handle) {
+ err = MFXVideoCORE_SetHandle(s->session, handle_type, handle);
+ if (err != MFX_ERR_NONE)
+ return AVERROR_UNKNOWN;
+ }
+
+ memset(&par, 0, sizeof(par));
+
+ if (opaque) {
+ s->surface_ptrs = av_mallocz_array(hw_frames_hwctx->nb_surfaces,
+ sizeof(*s->surface_ptrs));
+ if (!s->surface_ptrs)
+ return AVERROR(ENOMEM);
+ for (i = 0; i < hw_frames_hwctx->nb_surfaces; i++)
+ s->surface_ptrs[i] = hw_frames_hwctx->surfaces + i;
+ s->nb_surface_ptrs = hw_frames_hwctx->nb_surfaces;
+
+ s->opaque_alloc.In.Surfaces = s->surface_ptrs;
+ s->opaque_alloc.In.NumSurface = s->nb_surface_ptrs;
+ s->opaque_alloc.In.Type = hw_frames_hwctx->frame_type;
+
+ s->opaque_alloc.Out = s->opaque_alloc.In;
+
+ s->opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
+ s->opaque_alloc.Header.BufferSz = sizeof(s->opaque_alloc);
+
+ s->ext_buffers[0] = (mfxExtBuffer*)&s->opaque_alloc;
+
+ par.ExtParam = s->ext_buffers;
+ par.NumExtParam = FF_ARRAY_ELEMS(s->ext_buffers);
+
+ par.IOPattern = MFX_IOPATTERN_IN_OPAQUE_MEMORY | MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
+ } else {
+ mfxFrameAllocator frame_allocator = {
+ .pthis = ctx,
+ .Alloc = frame_alloc,
+ .Lock = frame_lock,
+ .Unlock = frame_unlock,
+ .GetHDL = frame_get_hdl,
+ .Free = frame_free,
+ };
+
+ s->mem_ids = av_mallocz_array(hw_frames_hwctx->nb_surfaces,
+ sizeof(*s->mem_ids));
+ if (!s->mem_ids)
+ return AVERROR(ENOMEM);
+ for (i = 0; i < hw_frames_hwctx->nb_surfaces; i++)
+ s->mem_ids[i] = hw_frames_hwctx->surfaces[i].Data.MemId;
+ s->nb_mem_ids = hw_frames_hwctx->nb_surfaces;
+
+ err = MFXVideoCORE_SetFrameAllocator(s->session, &frame_allocator);
+ if (err != MFX_ERR_NONE)
+ return AVERROR_UNKNOWN;
+
+ par.IOPattern = MFX_IOPATTERN_IN_VIDEO_MEMORY | MFX_IOPATTERN_OUT_VIDEO_MEMORY;
+ }
+
+ par.AsyncDepth = 1; // TODO async
+
+ par.vpp.In = hw_frames_hwctx->surfaces[0].Info;
+
+ par.vpp.In.CropW = ctx->inputs[0]->w;
+ par.vpp.In.CropH = ctx->inputs[0]->h;
+
+ if (ctx->inputs[0]->frame_rate.num) {
+ par.vpp.In.FrameRateExtN = ctx->inputs[0]->frame_rate.num;
+ par.vpp.In.FrameRateExtD = ctx->inputs[0]->frame_rate.den;
+ } else {
+ par.vpp.In.FrameRateExtN = ctx->inputs[0]->time_base.num;
+ par.vpp.In.FrameRateExtD = ctx->inputs[0]->time_base.den;
+ }
+
+ par.vpp.Out = par.vpp.In;
+
+ if (ctx->outputs[0]->frame_rate.num) {
+ par.vpp.Out.FrameRateExtN = ctx->outputs[0]->frame_rate.num;
+ par.vpp.Out.FrameRateExtD = ctx->outputs[0]->frame_rate.den;
+ } else {
+ par.vpp.Out.FrameRateExtN = ctx->outputs[0]->time_base.num;
+ par.vpp.Out.FrameRateExtD = ctx->outputs[0]->time_base.den;
+ }
+
+ err = MFXVideoVPP_Init(s->session, &par);
+ if (err != MFX_ERR_NONE) {
+ av_log(ctx, AV_LOG_ERROR, "Error opening the VPP for deinterlacing: %d\n", err);
+ return AVERROR_UNKNOWN;
+ }
+
+ return 0;
+}
+
+static int qsvdeint_config_props(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ AVFilterLink *inlink = ctx->inputs[0];
+ QSVDeintContext *s = ctx->priv;
+ int ret;
+
+ qsvdeint_uninit(ctx);
+
+ s->last_pts = AV_NOPTS_VALUE;
+ outlink->frame_rate = av_mul_q(inlink->frame_rate,
+ (AVRational){ 2, 1 });
+ outlink->time_base = av_mul_q(inlink->time_base,
+ (AVRational){ 1, 2 });
+
+ /* check that we have a hw context */
+ if (!inlink->hw_frames_ctx) {
+ av_log(ctx, AV_LOG_ERROR, "No hw context provided on input\n");
+ return AVERROR(EINVAL);
+ }
+
+ s->hw_frames_ctx = av_buffer_ref(inlink->hw_frames_ctx);
+ if (!s->hw_frames_ctx)
+ return AVERROR(ENOMEM);
+
+ av_buffer_unref(&outlink->hw_frames_ctx);
+ outlink->hw_frames_ctx = av_buffer_ref(inlink->hw_frames_ctx);
+ if (!outlink->hw_frames_ctx) {
+ qsvdeint_uninit(ctx);
+ return AVERROR(ENOMEM);
+ }
+
+ ret = init_out_session(ctx);
+ if (ret < 0)
+ return ret;
+
+
+ return 0;
+}
+
+static void clear_unused_frames(QSVDeintContext *s)
+{
+ QSVFrame *cur = s->work_frames;
+ while (cur) {
+ if (!cur->surface.Data.Locked) {
+ av_frame_free(&cur->frame);
+ cur->used = 0;
+ }
+ cur = cur->next;
+ }
+}
+
+static int get_free_frame(QSVDeintContext *s, QSVFrame **f)
+{
+ QSVFrame *frame, **last;
+
+ clear_unused_frames(s);
+
+ frame = s->work_frames;
+ last = &s->work_frames;
+ while (frame) {
+ if (!frame->used) {
+ *f = frame;
+ return 0;
+ }
+
+ last = &frame->next;
+ frame = frame->next;
+ }
+
+ frame = av_mallocz(sizeof(*frame));
+ if (!frame)
+ return AVERROR(ENOMEM);
+ *last = frame;
+ *f = frame;
+
+ return 0;
+}
+
+static int submit_frame(AVFilterContext *ctx, AVFrame *frame,
+ mfxFrameSurface1 **surface)
+{
+ QSVDeintContext *s = ctx->priv;
+ QSVFrame *qf;
+ int ret;
+
+ ret = get_free_frame(s, &qf);
+ if (ret < 0)
+ return ret;
+
+ qf->frame = frame;
+
+ qf->surface = *(mfxFrameSurface1*)qf->frame->data[3];
+
+ qf->surface.Data.Locked = 0;
+ qf->surface.Info.CropW = qf->frame->width;
+ qf->surface.Info.CropH = qf->frame->height;
+
+ qf->surface.Info.PicStruct = !qf->frame->interlaced_frame ? MFX_PICSTRUCT_PROGRESSIVE :
+ (qf->frame->top_field_first ? MFX_PICSTRUCT_FIELD_TFF :
+ MFX_PICSTRUCT_FIELD_BFF);
+ if (qf->frame->repeat_pict == 1)
+ qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FIELD_REPEATED;
+ else if (qf->frame->repeat_pict == 2)
+ qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FRAME_DOUBLING;
+ else if (qf->frame->repeat_pict == 4)
+ qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FRAME_TRIPLING;
+
+ if (ctx->inputs[0]->frame_rate.num) {
+ qf->surface.Info.FrameRateExtN = ctx->inputs[0]->frame_rate.num;
+ qf->surface.Info.FrameRateExtD = ctx->inputs[0]->frame_rate.den;
+ } else {
+ qf->surface.Info.FrameRateExtN = ctx->inputs[0]->time_base.num;
+ qf->surface.Info.FrameRateExtD = ctx->inputs[0]->time_base.den;
+ }
+
+ qf->surface.Data.TimeStamp = av_rescale_q(qf->frame->pts,
+ ctx->inputs[0]->time_base,
+ (AVRational){1, 90000});
+
+ *surface = &qf->surface;
+ qf->used = 1;
+
+ return 0;
+}
+
+static int process_frame(AVFilterContext *ctx, const AVFrame *in,
+ mfxFrameSurface1 *surf_in)
+{
+ QSVDeintContext *s = ctx->priv;
+ AVFilterLink *inlink = ctx->inputs[0];
+ AVFilterLink *outlink = ctx->outputs[0];
+
+ AVFrame *out;
+ mfxFrameSurface1 *surf_out;
+ mfxSyncPoint sync = NULL;
+ mfxStatus err;
+ int ret, again = 0;
+
+ out = av_frame_alloc();
+ if (!out)
+ return AVERROR(ENOMEM);
+
+ ret = av_hwframe_get_buffer(s->hw_frames_ctx, out, 0);
+ if (ret < 0)
+ goto fail;
+
+ surf_out = (mfxFrameSurface1*)out->data[3];
+ surf_out->Info.CropW = outlink->w;
+ surf_out->Info.CropH = outlink->h;
+ surf_out->Info.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+
+ do {
+ err = MFXVideoVPP_RunFrameVPPAsync(s->session, surf_in, surf_out,
+ NULL, &sync);
+ if (err == MFX_WRN_DEVICE_BUSY)
+ av_usleep(1);
+ } while (err == MFX_WRN_DEVICE_BUSY);
+
+ if (err == MFX_ERR_MORE_DATA) {
+ av_frame_free(&out);
+ return QSVDEINT_MORE_INPUT;
+ }
+
+ if ((err < 0 && err != MFX_ERR_MORE_SURFACE) || !sync) {
+ av_log(ctx, AV_LOG_ERROR, "Error during deinterlacing: %d\n", err);
+ ret = AVERROR_UNKNOWN;
+ goto fail;
+ }
+ if (err == MFX_ERR_MORE_SURFACE)
+ again = 1;
+
+ do {
+ err = MFXVideoCORE_SyncOperation(s->session, sync, 1000);
+ } while (err == MFX_WRN_IN_EXECUTION);
+ if (err < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Error synchronizing the operation: %d\n", err);
+ ret = AVERROR_UNKNOWN;
+ goto fail;
+ }
+
+ ret = av_frame_copy_props(out, in);
+ if (ret < 0)
+ goto fail;
+
+ out->width = outlink->w;
+ out->height = outlink->h;
+ out->interlaced_frame = 0;
+
+ out->pts = av_rescale_q(out->pts, inlink->time_base, outlink->time_base);
+ if (out->pts == s->last_pts)
+ out->pts++;
+ s->last_pts = out->pts;
+
+ ret = ff_filter_frame(outlink, out);
+ if (ret < 0)
+ return ret;
+
+ return again ? QSVDEINT_MORE_OUTPUT : 0;
+fail:
+ av_frame_free(&out);
+ return ret;
+}
+
+static int qsvdeint_filter_frame(AVFilterLink *link, AVFrame *in)
+{
+ AVFilterContext *ctx = link->dst;
+
+ mfxFrameSurface1 *surf_in;
+ int ret;
+
+ ret = submit_frame(ctx, in, &surf_in);
+ if (ret < 0) {
+ av_frame_free(&in);
+ return ret;
+ }
+
+ do {
+ ret = process_frame(ctx, in, surf_in);
+ if (ret < 0)
+ return ret;
+ } while (ret == QSVDEINT_MORE_OUTPUT);
+
+ return 0;
+}
+
+static int qsvdeint_request_frame(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ QSVDeintContext *s = ctx->priv;
+ int ret = 0;
+
+ s->got_output_frame = 0;
+ while (ret >= 0 && !s->got_output_frame)
+ ret = ff_request_frame(ctx->inputs[0]);
+
+ return ret;
+}
+
+#define OFFSET(x) offsetof(QSVDeintContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { NULL },
+};
+
+static const AVClass qsvdeint_class = {
+ .class_name = "deinterlace_qsv",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVFilterPad qsvdeint_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .filter_frame = qsvdeint_filter_frame,
+ },
+ { NULL }
+};
+
+static const AVFilterPad qsvdeint_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = qsvdeint_config_props,
+ .request_frame = qsvdeint_request_frame,
+ },
+ { NULL }
+};
+
+AVFilter ff_vf_deinterlace_qsv = {
+ .name = "deinterlace_qsv",
+ .description = NULL_IF_CONFIG_SMALL("QuickSync video deinterlacing"),
+
+ .uninit = qsvdeint_uninit,
+ .query_formats = qsvdeint_query_formats,
+
+ .priv_size = sizeof(QSVDeintContext),
+ .priv_class = &qsvdeint_class,
+
+ .inputs = qsvdeint_inputs,
+ .outputs = qsvdeint_outputs,
+};
--
2.0.0
Anton Khirnov
2016-07-21 11:00:02 UTC
Permalink
ping
--
Anton Khirnov
Luca Barbato
2016-07-21 16:49:49 UTC
Permalink
Post by Anton Khirnov
---
Changelog | 2 +-
configure | 1 +
libavfilter/Makefile | 1 +
libavfilter/allfilters.c | 1 +
libavfilter/vf_deinterlace_qsv.c | 580 +++++++++++++++++++++++++++++++++++++++
5 files changed, 584 insertions(+), 1 deletion(-)
create mode 100644 libavfilter/vf_deinterlace_qsv.c
Looks ok, maybe some code could be shared across the scale filter.

lu

Luca Barbato
2016-07-15 13:32:15 UTC
Permalink
Post by Anton Khirnov
+ "Mismatching AVCodecContext.sw_pix_fmt and AVHWFramesContext.sw_format\n");
Report which is which please.
Loading...