From patchwork Mon Feb 6 05:44:56 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: 40298 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3090365pzk; Sun, 5 Feb 2023 21:47:34 -0800 (PST) X-Google-Smtp-Source: AK7set+TN7PZ4f4+L57z8RfHl/0mv9UqVhHwdtEs2ajkaXrN+XgP0mD8PPYyQ2OUNMDLmLYUUtoK X-Received: by 2002:a17:907:948a:b0:893:7668:1f34 with SMTP id dm10-20020a170907948a00b0089376681f34mr9181706ejc.35.1675662454092; Sun, 05 Feb 2023 21:47:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675662454; cv=none; d=google.com; s=arc-20160816; b=RP2euGHvCdm+9VGLGomN1T7Ep0+ksoriS+3f4qbC45I0Xjd1Bk0/XBObjx0LR3etJs bZWG4P4CQs9xOJLaWoMexQyHQ+nuV0p/JmiCScTKTCVgccCOkyWVjk/9WHXG4WQwZ1c/ isyPqar7VX4CMBEYTSxpy8sDHlawOn0dvZTmZ4Ys8Y+PVMxqwH6O42dMVy8mOWw/FL9X cDWYJR3itg9eCwuP18YhLzjyixFqU/o4IWZo3iL+3CV2dd1aMXC64Ieu/KYlvcKnxdhp lkV5MF4tm+KSm/66IuW+RuIS70GhBXVfNCWkNypcP2srJ9beKdoM603uU7RCVf2M/i3K P+CA== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=y6VDCV3HyRaDIO/VKOcANrlsNddy21JEgopJdML0CnU=; b=qFtT90NNidVacTotC9smH94OIOybyAIsgsPVYKJ0cIW3lOQq3xcDtFk+MxhVvviJJR ukMJ9ZxQAc5cRQete6XhKnUYqkNxSNixX9SAvrS0Y4zek4AaJJ9oIO+PqbTkfwdSRjOw GMSddstRnNP9OvuRCBd224bU3GWIkJjTuxK3BTDAE+zPGiZR+JSl1iGnAue92uTuOxis frnexxjH2TJzEip5UNxmOthUSShzcDFEfBD83yX/aK6zCYQk3Gm9vvdk9N5V5t74fHTj ONg7ewhL+PLfr1JY9R3iVJmxE4JPHFwamPWJqyQcl/CnDApVxTHcmsduPsI/U7TFKVg8 HBEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=dvwVjLTk; 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 y14-20020a17090668ce00b008432fa22567si12953505ejr.649.2023.02.05.21.47.33; Sun, 05 Feb 2023 21:47:34 -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=dvwVjLTk; 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 7E53A68BEDA; Mon, 6 Feb 2023 07:46:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DC9B68BE95 for ; Mon, 6 Feb 2023 07:46: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=1675662382; x=1707198382; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=pXuG7eU4H624rWvc2n1fx8dkJ3wQyvtUr03EAJbcv3A=; b=dvwVjLTk+TnMZT+YuaR2SMwNheGMmxeO0aftPz1uGkSucITszGVHt9kB TBxn+e8c56RyV/LcGcDj9j96pXRoPxM7hBwSgP+bdkWtJf15Vo+A1Xbpu RL6iQDm0cNPus8BOz1pvePLox/ycrHwnW2IZ6vniWgkzeFcxi2KjwORIC Od2K+HoI6K2hS/LdFzriOyQ/Pqqt+SAqehUp95KcVW286ip7rt9t+yOEw AkAG4h6kyiie9ZpA+j3amFOFKbYPMjWMCLA/MkQDlrPrdzkQgcbS6kvXw TsCgEhhTDx74wcGwBBsSzkRZwXAJI4mIZECRC55b1Ol0MA0qbVirXpNoZ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="317144210" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="317144210" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2023 21:46:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="698737423" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="698737423" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga001.jf.intel.com with ESMTP; 05 Feb 2023 21:46:06 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Feb 2023 13:44:56 +0800 Message-Id: <20230206054458.907060-8-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230206054458.907060-1-fei.w.wang@intel.com> References: <20230206054458.907060-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 08/10] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M2+RmtdEae8j 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 a7b541750c..1cf43bd4dc 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -591,9 +591,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; @@ -632,6 +632,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 */