From: "Xiang, Haihao" <haihao.xiang-at-intel.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Haihao Xiang <haihao.xiang@intel.com>,
Wenbin Chen <wenbin.chen@intel.com>,
Fei Wang <fei.w.wang@intel.com>
Subject: [FFmpeg-devel] [PATCH 6/6] lavc/qsv: add support for decoding & encoding 12bit content
Date: Thu, 6 Oct 2022 15:35:38 +0800
Message-ID: <20221006073538.27710-6-haihao.xiang@intel.com> (raw)
In-Reply-To: <20221006073538.27710-1-haihao.xiang@intel.com>
From: Fei Wang <fei.w.wang@intel.com>
AV_PIX_FMT_P012, AV_PIX_FMT_Y212 and AV_PIX_FMT_XV36 are used in
FFmpeg and MFX_FOURCC_P016, MFX_FOURCC_Y216, and MFX_FOURCC_Y416 are used
in the SDK
Signed-off-by: Fei Wang <fei.w.wang@intel.com>
Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
libavcodec/qsv.c | 30 ++++++++++++++++++++++++++++++
libavcodec/qsvdec.c | 11 ++++++++++-
libavcodec/qsvenc_hevc.c | 1 +
3 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index f38c617fc3..7af154202c 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -213,6 +213,11 @@ enum AVPixelFormat ff_qsv_map_fourcc(uint32_t fourcc)
case MFX_FOURCC_Y210: return AV_PIX_FMT_Y210;
case MFX_FOURCC_AYUV: return AV_PIX_FMT_VUYX;
case MFX_FOURCC_Y410: return AV_PIX_FMT_XV30;
+#if QSV_VERSION_ATLEAST(1, 31)
+ case MFX_FOURCC_P016: return AV_PIX_FMT_P012;
+ case MFX_FOURCC_Y216: return AV_PIX_FMT_Y212;
+ case MFX_FOURCC_Y416: return AV_PIX_FMT_XV36;
+#endif
#endif
}
return AV_PIX_FMT_NONE;
@@ -259,6 +264,20 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc, uint16_t *shi
*fourcc = MFX_FOURCC_Y410;
*shift = 0;
return AV_PIX_FMT_XV30;
+#if QSV_VERSION_ATLEAST(1, 31)
+ case AV_PIX_FMT_P012:
+ *fourcc = MFX_FOURCC_P016;
+ *shift = 1;
+ return AV_PIX_FMT_P012;
+ case AV_PIX_FMT_Y212:
+ *fourcc = MFX_FOURCC_Y216;
+ *shift = 1;
+ return AV_PIX_FMT_Y212;
+ case AV_PIX_FMT_XV36:
+ *fourcc = MFX_FOURCC_Y416;
+ *shift = 1;
+ return AV_PIX_FMT_XV36;
+#endif
#endif
default:
return AVERROR(ENOSYS);
@@ -270,6 +289,7 @@ int ff_qsv_map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface)
switch (frame->format) {
case AV_PIX_FMT_NV12:
case AV_PIX_FMT_P010:
+ case AV_PIX_FMT_P012:
surface->Data.Y = frame->data[0];
surface->Data.UV = frame->data[1];
/* The SDK checks Data.V when using system memory for VP9 encoding */
@@ -289,6 +309,7 @@ int ff_qsv_map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface)
break;
case AV_PIX_FMT_Y210:
+ case AV_PIX_FMT_Y212:
surface->Data.Y16 = (mfxU16 *)frame->data[0];
surface->Data.U16 = (mfxU16 *)frame->data[0] + 1;
surface->Data.V16 = (mfxU16 *)frame->data[0] + 3;
@@ -307,6 +328,15 @@ int ff_qsv_map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface)
surface->Data.U = frame->data[0];
break;
+ case AV_PIX_FMT_XV36:
+ surface->Data.U = frame->data[0];
+ surface->Data.Y = frame->data[0] + 2;
+ surface->Data.V = frame->data[0] + 4;
+ // Only set Data.A to a valid address, the SDK doesn't
+ // use the value from the frame.
+ surface->Data.A = frame->data[0] + 6;
+ break;
+
default:
return AVERROR(ENOSYS);
}
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 912d58965a..73405b5747 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -137,14 +137,19 @@ static int qsv_get_continuous_buffer(AVCodecContext *avctx, AVFrame *frame,
frame->linesize[0] = FFALIGN(avctx->width, 128);
break;
case AV_PIX_FMT_P010:
+ case AV_PIX_FMT_P012:
case AV_PIX_FMT_YUYV422:
frame->linesize[0] = 2 * FFALIGN(avctx->width, 128);
break;
case AV_PIX_FMT_Y210:
case AV_PIX_FMT_VUYX:
case AV_PIX_FMT_XV30:
+ case AV_PIX_FMT_Y212:
frame->linesize[0] = 4 * FFALIGN(avctx->width, 128);
break;
+ case AV_PIX_FMT_XV36:
+ frame->linesize[0] = 8 * FFALIGN(avctx->width, 128);
+ break;
default:
av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format.\n");
return AVERROR(EINVAL);
@@ -156,7 +161,8 @@ static int qsv_get_continuous_buffer(AVCodecContext *avctx, AVFrame *frame,
frame->data[0] = frame->buf[0]->data;
if (avctx->pix_fmt == AV_PIX_FMT_NV12 ||
- avctx->pix_fmt == AV_PIX_FMT_P010) {
+ avctx->pix_fmt == AV_PIX_FMT_P010 ||
+ avctx->pix_fmt == AV_PIX_FMT_P012) {
frame->linesize[1] = frame->linesize[0];
frame->data[1] = frame->data[0] +
frame->linesize[0] * FFALIGN(avctx->height, 64);
@@ -1041,10 +1047,13 @@ const FFCodec ff_##x##_qsv_decoder = { \
.p.priv_class = &x##_qsv_class, \
.p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, \
AV_PIX_FMT_P010, \
+ AV_PIX_FMT_P012, \
AV_PIX_FMT_YUYV422, \
AV_PIX_FMT_Y210, \
+ AV_PIX_FMT_Y212, \
AV_PIX_FMT_VUYX, \
AV_PIX_FMT_XV30, \
+ AV_PIX_FMT_XV36, \
AV_PIX_FMT_QSV, \
AV_PIX_FMT_NONE }, \
.hw_configs = qsv_hw_configs, \
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
index 1e1574a6f2..8127fcc6c3 100644
--- a/libavcodec/qsvenc_hevc.c
+++ b/libavcodec/qsvenc_hevc.c
@@ -310,6 +310,7 @@ const FFCodec ff_hevc_qsv_encoder = {
.p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HYBRID,
.p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12,
AV_PIX_FMT_P010,
+ AV_PIX_FMT_P012,
AV_PIX_FMT_YUYV422,
AV_PIX_FMT_Y210,
AV_PIX_FMT_QSV,
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-10-06 7:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-06 7:35 [FFmpeg-devel] [PATCH 1/6] lavu/hwcontext_qsv: specify Shift for each format Xiang, Haihao
2022-10-06 7:35 ` [FFmpeg-devel] [PATCH 2/6] lavc/qsv: specify Shift for each format too Xiang, Haihao
2022-10-06 7:35 ` [FFmpeg-devel] [PATCH 3/6] lavu/hwcontext_qsv: add support for 10bit 4:4:4 content on Linux Xiang, Haihao
2022-10-06 7:35 ` [FFmpeg-devel] [PATCH 4/6] lavc/qsv: add support for decoding & encoding 10bit 4:4:4 content Xiang, Haihao
2022-10-06 7:35 ` [FFmpeg-devel] [PATCH 5/6] lavu/hwcontext_qsv: add support for 12bit content on Linux Xiang, Haihao
2022-10-06 7:35 ` Xiang, Haihao [this message]
2022-10-09 1:44 ` [FFmpeg-devel] [PATCH 1/6] lavu/hwcontext_qsv: specify Shift for each format Xiang, Haihao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221006073538.27710-6-haihao.xiang@intel.com \
--to=haihao.xiang-at-intel.com@ffmpeg.org \
--cc=fei.w.wang@intel.com \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=haihao.xiang@intel.com \
--cc=wenbin.chen@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git