From patchwork Fri Feb 18 05:50:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 34379 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp638073nkx; Thu, 17 Feb 2022 21:50:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxmCoHf2v3wlrMsvZFtAHaFpLR2WrYFGRLAtiqfV+wAUWcURc9wcepTHd6TTL17xgYpZ3Me X-Received: by 2002:a17:906:2cd0:b0:6cf:d02f:303b with SMTP id r16-20020a1709062cd000b006cfd02f303bmr5340543ejr.650.1645163428847; Thu, 17 Feb 2022 21:50:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645163428; cv=none; d=google.com; s=arc-20160816; b=zKOICSmZSrbElROEjMOkLUcF+/HHTkL/joEpAGhB3AS+DJj30C+/CE/lCvy5CUy+r9 +KFKq0Z5oyvGeEjTFng/l9R9Mr2lX3Wz5mjXEqNEstEkERwSI4iH5WYyI33CfK3XIk0f DXMuzqi+T/Lu6RmlnBrZMoZQBixdHj2GkLQiWABrQaDQhFngH9JU0Un0rL/8mFcfhy9q IKWRiDUjytSklSVbl23FElAJSDEjP0YayBk07zPKoUEP3nadZ3jZVnBb3Z21gVCPTL9E zGGVX/1GwkusdAjqnHO1MATI1t3FOsSGppWguNDlg58wbZHWL/rWidou3oS1oLqLR1If 40ug== 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=kE//bAqWQMGVi/r5lcIP7aIdqP9KSicEigg/6u5b024=; b=X6tDF2pZdVekJ2Cr8Q1y75bitFbV0z4MVnMvxkDfe37TRSOSNKqi+p9wQpCN1jQftd 26Jww7jFWOsS/GirAPlbJR9h3FYy7Zgsy17Zueuk4+QgOZ1FE93LUKI2C+aQfiNl2YH3 XF0suwpvjhPUV/bL0NvAdozqZLfJMzFdOk/s76iBHp6/azL5ze5jff4OsPXMjOfBUyy3 kPVoO3wOw2tKZlvb1mh+efmjeyyAT7OweP3IWkyeQKN+cUBzse8rD1TRhPQHfmB/p+Ne dgp7g9K2DaCgCmOCaWOWJiaursFx5Q7ZgYZKq0SvOKYNYChiSUqSbSa8jn8scGszhd4r J2PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=B7CK1aBU; 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 hb15si3469393ejc.81.2022.02.17.21.50.28; Thu, 17 Feb 2022 21:50:28 -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=B7CK1aBU; 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 5B14168B14C; Fri, 18 Feb 2022 07:50:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACE9D68B10A for ; Fri, 18 Feb 2022 07:50:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645163422; x=1676699422; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=z6JTP+Hwv/f5IrIldXE7rfjrb/tJVoeB0ZNqdfJSGxw=; b=B7CK1aBUDqOwVuAO+S1mM89fPWondoMLVU74fMTaDfp0ps94FrbIfbLI +Bb40U/y2ansb+nMnA5XKuKKo5WC7/dCWTs8sc1033Aha95PQnK9hsVtF dFKh6qPtivkXq8s0jOHrsYJ9dNqP1DmdTenuNv2nA2OoHpFpxdy6n2zAo mtwpBTnJ/aEUZVSn2hu7PpbTGVl8xzBMvix7fo4YPbX9de4Yl8gU96+B4 BbG9ATzW8yWumsi4muEqiH4PwLhcMOtKkwa3B148EOgvyKciETvr6wZhj y2viTTkuTPgGmU3tZ9G7cYaC8DwiXtcDT2fq8Wc9Xb03SOFdjolBjF0DB g==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="231041086" X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="231041086" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 21:50:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="504778571" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga006.jf.intel.com with ESMTP; 17 Feb 2022 21:50:13 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 13:50:12 +0800 Message-Id: <20220218055012.916556-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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: sgDUpUMOHy+p 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. The X2RGB10 correspond to the A2RGB20 format and BGRA correspond to RGB4 format in MediaSDK. Signed-off-by: Wenbin Chen --- libavcodec/qsv.c | 16 ++++++++++++++++ libavcodec/qsvenc.c | 8 ++++++++ libavcodec/qsvenc_hevc.c | 6 ++++++ 3 files changed, 30 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..40d60cde3c 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1616,6 +1616,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,