From patchwork Wed Jan 12 08:36:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 33276 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4440155iog; Wed, 12 Jan 2022 00:37:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwn9pEBRHaHg5B4JR8MW82X5BmSCQIx8ZXrc0+MC5D0XuMnc5LKjTuhxyZU1t7Im+6tu+2 X-Received: by 2002:a17:907:763a:: with SMTP id jy26mr6763406ejc.296.1641976645632; Wed, 12 Jan 2022 00:37:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641976645; cv=none; d=google.com; s=arc-20160816; b=JiM50Gaje1Pca+IMMq1gvUfIdIwV/phUz4tTWxDXbhlDdNmfFSZ+0TX+9qIxg4HSDS tOLPuOYxZH1zDolLduv7mGV3ndDElo5a0rtOoxO2SqRgGjrOhuGbupRcdAE88kgxL3A/ GUazkCfXkbALwa8HPdeN34Q+de43KF8/0V+CIzsfm5hNfyhBGR+eFJWL70zmYRhC1KSi nu+TcCr2Jib0jQPadfD05a7g34w6Q88iS4TeeLBzcBxr7bmMjEMNlhSWGWJmtXdUWFpC mz1BnXUMT1ul2Aq0VJTcTgnoNc+kYrGrYTPRYXxghcdLkmT8MSKv0gBiFcJgfURVzlvx vP0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=b+90oNQM73GiZtQnBuAimnv5+KpJq1VZrs5nI/VmXL8=; b=oSlXcnSEc/GZi19Rvt7pxQugoaZcZod4YBRpIvCWftr9poyQQCDYTd3mqRZPzWPJH8 7kugJiQA0VzOkBUs8Sg+zw9rTYVX/EHaZTrz2D5JilG/UtdU5P2NdV0gMBhdjLmtThgP SRZY5IiNG6CHeNwd+pRL2+VnQFDby1IvLmxZOCeN+CgFji3ejmypjl2vrRypPTktxDlc B1L41or7M1vafBwOMYCaRdsoIFrVjdc5UlteOqWhPBwydXWVbI8L0fHlUE9MeoGXlFsy XfFYV8L+5QVu/fjzqJdvWw2D9XA2T8Jx+1Wx6XcG7bw1Tc+4EbDk22OA7AdIi0/12w3Z iNfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=GuzirxrD; 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 i8si6772533ejj.381.2022.01.12.00.37.24; Wed, 12 Jan 2022 00:37:25 -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=GuzirxrD; 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 D237B68ABCA; Wed, 12 Jan 2022 10:37:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7529368A4AC for ; Wed, 12 Jan 2022 10:37:13 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641976638; x=1673512638; h=from:to:cc:subject:date:message-id; bh=qsMXPYOVkbfJzMFaI6cKNjN86R/vla/vJdmS1HMayBU=; b=GuzirxrDqzYMNh7AH9nwHQVJgeJy+8DLu1zigqypoJUtFbL5XuSrWMkc zgL8VP2r3A+WuSlO2smE70Ue90GedfvpT9RiMaz+ufEqvI5+c2CcBNdkE a7F8FEAHcI2hek1Dj9Xcy9uul+d3swLJIX74p7pCUAmV7dgdXhls0zkjq ApZ9IHrBDyv8Brx6rX5Di50anJ91/P3ILOdt7mmkqbLk6Ehm/2WCGMP53 jYGKU6Rc86yrMBmAZprlifwgQIGIEit68NW2Y1u3a/mzRh1jLs/Lk8t8A YFhW49lDCObqvVYXM9kk9yhSLg73xZjfGGN9ramIYl0+/9rb7th20wrY+ w==; X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="307039893" X-IronPort-AV: E=Sophos;i="5.88,282,1635231600"; d="scan'208";a="307039893" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 00:37:08 -0800 X-IronPort-AV: E=Sophos;i="5.88,282,1635231600"; d="scan'208";a="670082260" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 00:37:07 -0800 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 16:36:57 +0800 Message-Id: <20220112083657.10709-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2] lavc/qsvenc: add encode support for screen content coding extension 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: Haihao Xiang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MMvooQVJ9Z2Y Enables HEVC Screen Content Coding extension support on ICL+ platform Signed-off-by: Haihao Xiang --- v2: rebased it against the latest master and added scc to the doc doc/encoders.texi | 3 +++ libavcodec/qsvenc.c | 3 +++ libavcodec/qsvenc_hevc.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 7cc8be1209..78518629cd 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3411,12 +3411,15 @@ an internal session. Depth of look ahead in number frames, available when extbrc option is enabled. @item @var{profile} +Set the encoding profile (scc requires libmfx >= 1.32). + @table @samp @item unknown @item main @item main10 @item mainsp @item rext +@item scc @end table @item @var{gpb} diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 4e7a15f060..269386624d 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -74,6 +74,9 @@ static const struct profile_names hevc_profiles[] = { { MFX_PROFILE_HEVC_MAINSP, "hevc mainsp" }, { MFX_PROFILE_HEVC_REXT, "hevc rext" }, #endif +#if QSV_VERSION_ATLEAST(1, 32) + { MFX_PROFILE_HEVC_SCC, "hevc scc" }, +#endif }; static const struct profile_names vp9_profiles[] = { diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 08aba3011d..07010c698e 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -244,6 +244,9 @@ static const AVOption options[] = { { "main10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAIN10 }, INT_MIN, INT_MAX, VE, "profile" }, { "mainsp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAINSP }, INT_MIN, INT_MAX, VE, "profile" }, { "rext", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_REXT }, INT_MIN, INT_MAX, VE, "profile" }, +#if QSV_VERSION_ATLEAST(1, 32) + { "scc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_SCC }, INT_MIN, INT_MAX, VE, "profile" }, +#endif { "gpb", "1: GPB (generalized P/B frame); 0: regular P frame", OFFSET(qsv.gpb), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE},