From patchwork Tue Feb 15 07:00:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 34299 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp52408nkf; Mon, 14 Feb 2022 23:02:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJzI1gBHVf1zuw5kC81puugtSxmLqsHxqVs478GsBHLMJJRpsKqY4UrHasaJ+qXu3LNpNfhD X-Received: by 2002:a17:906:d62:: with SMTP id s2mr1898652ejh.176.1644908573985; Mon, 14 Feb 2022 23:02:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644908573; cv=none; d=google.com; s=arc-20160816; b=bTsvD5n+GqKeW120lreCqHY5WEc/+KRuNZh3GLWjSqZ7ZxsQydULQPLMJ2YhuzW12z lzwD6s0x4VNo/xsRNlOShUYH7/Lq+7AiWc3rlxLbHaHo6RRRACceu2SBRy5sVXI7jiMB ilVkopnsJJnJJS+Y3fDhc+g2o7HMzh04c47pV5w3svDKjvCNBLy7RdeS3mwB9aAGc/Ko 4LLwcCujqecq33pZsVPn3dgrv3q9FLZpwDRgWjA1ijJIgGgX3EcbJ7EwfkxQ5LGxJlI8 ltGIW0F3KWgHN+a2QvTxT+5afckOjGAJGdLT2w1OPNk19JZBqS6h3nYH6aBadcWE1FtQ TfYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=kTd+T6KQqj2LjDsJLb3ldR1NUw2wz96XYmOvXnm1Cg0=; b=DF4ZUCMc9pQMYzOzuIc7vZ3XWt25Rw7bC7u05d3x7IJxzK8Qi8i0xn978XoxSIXUsQ kEnhrpwmvStQbMyYc9pYjkfkN99PNeKj6tzEQfv3/TmBqitRYN9L6AyDMA578aoYNK/y omVQbqJUiHwgc5H6nX/AGhAM4XpwRe6NJuykwH7I/0EVs7hJ/5M6lIr875xDEcLeSwRJ Ry+l/DyzRggtHmlK/8gHq0v7EIdpg8XTCwoiqnzGdt1kUg+ZGKUbvDxh5enpqZKE7RqP 6TO5FvKV1X7HbYLQyM6/99sYWFIY95939aL0gnnt49tCamn+YAy0r2gbROi6kKVd9rTH Dg1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=dt3ibzls; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s21si2624652edr.333.2022.02.14.23.02.52; Mon, 14 Feb 2022 23:02:53 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=dt3ibzls; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7664A68B22C; Tue, 15 Feb 2022 09:02:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 378AA68B01B for ; Tue, 15 Feb 2022 09:02:41 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644908567; x=1676444567; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=7QTPY0q/P+TQKVrZILtUbwO7fCCQGR5jRql67w1SoHk=; b=dt3ibzlsv6PMHFRk4n3Ccs9FL9qSLl4+X3PS1ADuP04JZsheL78IcsFz uyXCzLefWmE6QrUsKGv6ZZ02j9ZmF6jRWqDTBiYf/TI23M/tEcijeLn3V gPI+rc23LFgq6pchpV2o6+LWxOwvTlCwhY3+2ejsI1ifT1T4N7Fwe886x 0CerurPCd7glmweIH+jKWPfEKfP5Kjx6ML3FgkxtjcDazDq/4823vRjAR b3S2fw7pOVWOMbeItAN0jXbsIt0F5IztaV0AmewJPeZxPWIOQgop675vX gL9yHzgaG2WPTejL1hpirPMJYqP1QoiVrQQSanSWJ4yBvD9YKg0Q7C5Cw g==; X-IronPort-AV: E=McAfee;i="6200,9189,10258"; a="336693286" X-IronPort-AV: E=Sophos;i="5.88,370,1635231600"; d="scan'208";a="336693286" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2022 23:00:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,370,1635231600"; d="scan'208";a="680873174" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by fmsmga001.fm.intel.com with ESMTP; 14 Feb 2022 23:00:54 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 15:00:53 +0800 Message-Id: <20220215070053.653351-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] libavcodec/qsvenc_hevc: encode RGB format rawvideo X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UoqNnvaW3fFa Add support for hevc_qsv to input RGB format frame. It will transform frame to yuv inside MediaSDK instead of using auto scale. Now hevc_qsv supports directly encoding BGRA and X2RGB10 format. X2RGB10 is only supported in VDENC (-low_power 1). The X2RGB10 correspond to the A2RGB20 format in MediaSDK. Signed-off-by: Wenbin Chen --- libavcodec/qsv.c | 16 ++++++++++++++++ libavcodec/qsvenc.c | 13 +++++++++++++ libavcodec/qsvenc_hevc.c | 6 ++++++ 3 files changed, 35 insertions(+) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 1a432dbd82..b75877e698 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -189,6 +189,12 @@ enum AVPixelFormat ff_qsv_map_fourcc(uint32_t fourcc) case MFX_FOURCC_NV12: return AV_PIX_FMT_NV12; case MFX_FOURCC_P010: return AV_PIX_FMT_P010; case MFX_FOURCC_P8: return AV_PIX_FMT_PAL8; +#if QSV_VERSION_ATLEAST(1, 9) + case MFX_FOURCC_A2RGB10: return AV_PIX_FMT_X2RGB10; +#endif +#if QSV_VERSION_ATLEAST(1, 17) + case MFX_FOURCC_RGB4: return AV_PIX_FMT_BGRA; +#endif #if CONFIG_VAAPI case MFX_FOURCC_YUY2: return AV_PIX_FMT_YUYV422; #if QSV_VERSION_ATLEAST(1, 27) @@ -211,6 +217,16 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc) case AV_PIX_FMT_P010: *fourcc = MFX_FOURCC_P010; return AV_PIX_FMT_P010; +#if QSV_VERSION_ATLEAST(1, 9) + case AV_PIX_FMT_X2RGB10: + *fourcc = MFX_FOURCC_A2RGB10; + return AV_PIX_FMT_X2RGB10; +#endif +#if QSV_VERSION_ATLEAST(1, 17) + case AV_PIX_FMT_BGRA: + *fourcc = MFX_FOURCC_RGB4; + return AV_PIX_FMT_BGRA; +#endif #if CONFIG_VAAPI case AV_PIX_FMT_YUV422P: case AV_PIX_FMT_YUYV422: diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 07be4287b7..104133fc59 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -715,6 +715,11 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (ret < 0) return AVERROR_BUG; + if (sw_format == AV_PIX_FMT_X2RGB10 && q->low_power != 1) { + av_log(avctx, AV_LOG_ERROR, "Only VDENC support encoding x2rgb10\n"); + return AVERROR(EINVAL); + } + q->param.mfx.FrameInfo.CropX = 0; q->param.mfx.FrameInfo.CropY = 0; q->param.mfx.FrameInfo.CropW = avctx->width; @@ -1616,6 +1621,14 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame, qf->surface.Data.V = qf->surface.Data.UV + 2; break; + case AV_PIX_FMT_X2RGB10: + case AV_PIX_FMT_BGRA: + qf->surface.Data.B = qf->frame->data[0]; + qf->surface.Data.G = qf->frame->data[0] + 1; + qf->surface.Data.R = qf->frame->data[0] + 2; + qf->surface.Data.A = qf->frame->data[0] + 3; + break; + default: /* should not reach here */ av_assert0(0); diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 5cac141c4d..ade546d4ca 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -304,6 +304,12 @@ const AVCodec ff_hevc_qsv_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, AV_PIX_FMT_P010, AV_PIX_FMT_QSV, +#if QSV_VERSION_ATLEAST(1, 17) + AV_PIX_FMT_BGRA, +#endif +#if QSV_VERSION_ATLEAST(1, 9) + AV_PIX_FMT_X2RGB10, +#endif AV_PIX_FMT_NONE }, .priv_class = &class, .defaults = qsv_enc_defaults,