From patchwork Tue Jan 3 12:59:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 39846 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8049929pzb; Tue, 3 Jan 2023 05:01:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXtsiTRInYnl3dVOVE/H0u/lH9pCTsXDDJNoVWb62bEjBkQy+UPj0T20VXP/sYabeD0ZXk4T X-Received: by 2002:aa7:df82:0:b0:473:280e:1959 with SMTP id b2-20020aa7df82000000b00473280e1959mr35528275edy.16.1672750913393; Tue, 03 Jan 2023 05:01:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672750913; cv=none; d=google.com; s=arc-20160816; b=QBxzu8mY3Aevz9V5dk0GtwKHkZp1TRUZHw82raEqbXvi20wn8sx11h6LE9dxR+6OFi v18mHA0sSRPboapvEBScjNh2w7nZG5LWM8grIQgLhJlphCqvuQ/4cLYjmIGoV7cGwTl5 OeyICfkSeW3In52yWY+vFGTSEOJ3d4K9E/PCM01mHZh7yw/i0KWhDAKNiekHvFwCejFm QTQ9ZEiseERUEUQTsGRRzKl7qgoMHrE/Dr2ZUdFV9buGHrSpWYSKajgUKRxcRoMAM8ah sR3rVd0h4n6ue1l+MPS+D54i5OCp5IOPSEVCWgn6dHq5MVDdyUiMw41doJbwuEz1HBGO Y4Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=9y2sYznUwFcFbCgVreP4Jg/hY6yASofEwFIf3i7Tdq4=; b=lRYYtzUS9LKkrjc64jfOg0DARpIDYabgWxSUUDItntenwIUYcrcSxMvbHLF81Zylkn 2JbDuRjbnj/MPRxoSgDrqJ2symAE5s138zCyUjCp90cWYMimqlzZfIwEtT4JsiOPvB89 LNE4cY5ZDqhFoZBJJkyjVBvdHJK1xpO0R0lAoZ5CUgV/NKjVtjvdtldtvdzGwMckbrGj Drs6Qf1WJdhJDXlqJxA0Xwovo62+C/ndVR+BqhsfeOvZAap4wbLqJkF2dIdOKZ/Upn+I YCqNRVTz14SfOqRk8cIbje+qG7DKrmzrubMxxXXl6MGLQ/LtEjofaPtoyMYqae2XKAYr IH5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=hA3ZP7dX; 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 z24-20020aa7cf98000000b004866d75a5bfsi17507564edx.572.2023.01.03.05.01.52; Tue, 03 Jan 2023 05:01: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=hA3ZP7dX; 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 CA52E68BD61; Tue, 3 Jan 2023 15:00:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9786568BD51 for ; Tue, 3 Jan 2023 15:00:49 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672750849; x=1704286849; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hmm96N2EuVMW4p26W3oPsqzIxixkqHwJHDxg3DAgbqM=; b=hA3ZP7dXW8AD5l/fIf2M75jomzfBtUHtmGCetdjFBPt7KFqYkhkZVSU2 YMYlNpzyIJzX7nlyUuWYa1b2b4XFAXczMMh97ZQl7H+kQwxKERXW2XNM3 MRqy2RpvCeof3Iqh6tsJJiau8sqUvpfQBRNmoVYwc3vqWUsQpS3lz5ULs tLBfsuZQevLy5ze9VvYvg0yyEcqSDLFy+dCnPf7+NHwFeEyBW5drr7u97 ANpcCqRn8etV2PvzixlB3hqLdq2m1tsrkc1d1/3yeZft7kvG59E1SnK9E 2WLEodz5Ievqr4wvsAhGZ0ZoeEHnv8ZvzhTmArVmnke0etf8HYGz7EgJe g==; X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="302026296" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="302026296" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2023 05:00:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="718091878" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="718091878" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga008.fm.intel.com with ESMTP; 03 Jan 2023 05:00:42 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jan 2023 20:59:50 +0800 Message-Id: <20230103125952.2707824-9-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230103125952.2707824-1-fei.w.wang@intel.com> References: <20230103125952.2707824-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 09/11] lavc/vaapi_hevc: Add vaapi profile parse support for SCC 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 Cc: Linjie Fu , Fei Wang , Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RtZ96YKJPdFU From: Linjie Fu Note that Screen-Extended Main 4:4:4 and 4:4:4 10 supports chroma_format_idc from 0, 1 or 3, hence both 420 and 444 are supported. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/vaapi_decode.c | 4 +++- libavcodec/vaapi_hevc.c | 14 ++++++++++++-- libavcodec/vaapi_hevc.h | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 134f10eca5..ab8c12e364 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -410,7 +410,9 @@ static const struct { #endif #if VA_CHECK_VERSION(1, 2, 0) && CONFIG_HEVC_VAAPI_HWACCEL MAP(HEVC, HEVC_REXT, None, - ff_vaapi_parse_hevc_rext_profile ), + ff_vaapi_parse_hevc_rext_scc_profile ), + MAP(HEVC, HEVC_SCC, None, + ff_vaapi_parse_hevc_rext_scc_profile ), #endif MAP(MJPEG, MJPEG_HUFFMAN_BASELINE_DCT, JPEGBaseline), diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index 73a8f5b4ce..c10617a81a 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -586,9 +586,9 @@ static int ptl_convert(const PTLCommon *general_ptl, H265RawProfileTierLevel *h2 } /* - * Find exact va_profile for HEVC Range Extension + * Find exact va_profile for HEVC Range Extension and Screen Content Coding Extension */ -VAProfile ff_vaapi_parse_hevc_rext_profile(AVCodecContext *avctx) +VAProfile ff_vaapi_parse_hevc_rext_scc_profile(AVCodecContext *avctx) { const HEVCContext *h = avctx->priv_data; const HEVCSPS *sps = h->ps.sps; @@ -627,6 +627,16 @@ VAProfile ff_vaapi_parse_hevc_rext_profile(AVCodecContext *avctx) else if (!strcmp(profile->name, "Main 4:4:4 12") || !strcmp(profile->name, "Main 4:4:4 12 Intra")) return VAProfileHEVCMain444_12; + else if (!strcmp(profile->name, "Screen-Extended Main")) + return VAProfileHEVCSccMain; + else if (!strcmp(profile->name, "Screen-Extended Main 10")) + return VAProfileHEVCSccMain10; + else if (!strcmp(profile->name, "Screen-Extended Main 4:4:4")) + return VAProfileHEVCSccMain444; +#if VA_CHECK_VERSION(1, 8, 0) + else if (!strcmp(profile->name, "Screen-Extended Main 4:4:4 10")) + return VAProfileHEVCSccMain444_10; +#endif #else av_log(avctx, AV_LOG_WARNING, "HEVC profile %s is " "not supported with this VA version.\n", profile->name); diff --git a/libavcodec/vaapi_hevc.h b/libavcodec/vaapi_hevc.h index b3b0e6fc1e..449635d0d7 100644 --- a/libavcodec/vaapi_hevc.h +++ b/libavcodec/vaapi_hevc.h @@ -22,6 +22,6 @@ #include #include "avcodec.h" -VAProfile ff_vaapi_parse_hevc_rext_profile(AVCodecContext *avctx); +VAProfile ff_vaapi_parse_hevc_rext_scc_profile(AVCodecContext *avctx); #endif /* AVCODEC_VAAPI_HEVC_H */