[libav-devel] [PATCH 3/6] qsvdec: Pass the correct profile to libmfx

[Mark Thompson]

This was correct for H.26[45], because libmfx uses the same values
derived from profile_idc and the constraint_set flags, but it is
wrong for other codecs.
---
 libavcodec/qsv.c          | 16 ++++++++++++++++
 libavcodec/qsv_internal.h |  1 +
 libavcodec/qsvdec.c       |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 9119586..81d066e 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -54,6 +54,22 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id)
     return AVERROR(ENOSYS);
 }

+int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile)
+{
+    if (profile == FF_PROFILE_UNKNOWN)
+        return MFX_PROFILE_UNKNOWN;
+    switch (codec_id) {
+    case AV_CODEC_ID_H264:
+    case AV_CODEC_ID_HEVC:
+        return profile;
+    case AV_CODEC_ID_VC1:
+        return 4 * profile + 1;
+    case AV_CODEC_ID_MPEG2VIDEO:
+        return 0x10 * profile;
+    }
+    return MFX_PROFILE_UNKNOWN;
+}
+
 static const struct {
     mfxStatus   mfxerr;
     int         averr;
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
index 41f4c3d..c05bf74 100644
--- a/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@ -66,6 +66,7 @@ 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_profile_to_mfx(enum AVCodecID codec_id, int profile);

 int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc);

diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index e19eba5..6bf75b6 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -144,7 +144,7 @@ static int qsv_decode_init(AVCodecContext *avctx, 
QSVContext *q)
         return ret;

     param.mfx.CodecId      = ret;
-    param.mfx.CodecProfile = avctx->profile;
+    param.mfx.CodecProfile = ff_qsv_profile_to_mfx(avctx->codec_id, 
avctx->profile);
     param.mfx.CodecLevel   = avctx->level;

     param.mfx.FrameInfo.BitDepthLuma   = desc->comp[0].depth;
-- 
2.7.4

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel