From patchwork Mon Sep 28 08:21:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 22642 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5DC6C44B052 for ; Mon, 28 Sep 2020 11:21:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFCBC68B615; Mon, 28 Sep 2020 11:21:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A53368B5EE for ; Mon, 28 Sep 2020 11:21:19 +0300 (EEST) IronPort-SDR: TGIa1/y1JbZrFNjd6U/Dj0rjfmIWBmLjR276w9rqcp54lHupNTO4Rscs06PXir1sTSbWes8OUX PsdfNMPJkHgw== X-IronPort-AV: E=McAfee;i="6000,8403,9757"; a="161188752" X-IronPort-AV: E=Sophos;i="5.77,313,1596524400"; d="scan'208";a="161188752" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2020 01:21:17 -0700 IronPort-SDR: aClumjFMPyzZhmmNosKEUxN8IkAVC4BNNDRzDVX/F1O1l1P2gxL/Md+MJJfjG9IvdoG5BsGPIV BWIF/VtqYnwA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,313,1596524400"; d="scan'208";a="513365986" Received: from xhh-tgl64.sh.intel.com ([10.239.159.152]) by fmsmga006.fm.intel.com with ESMTP; 28 Sep 2020 01:21:17 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Sep 2020 16:21:02 +0800 Message-Id: <20200928082102.1312258-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: add support for Screen Content Coding (SCC) extension X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This patch adds support for SCC encoding on ICL+ platform Sample pipeline: ffmpeg -init_hw_device qsv=qsv:hw -f lavfi -i testsrc -vf \ "format=nv12,hwupload=extra_hw_frames=64,format=qsv" -c:v hevc_qsv \ -profile:v scc -low_power 1 out.h265 --- libavcodec/qsvenc.c | 3 +++ libavcodec/qsvenc_hevc.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 1ed8f5d973..29750735e0 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -69,6 +69,9 @@ static const struct { { MFX_PROFILE_HEVC_MAINSP, "mainsp" }, { MFX_PROFILE_HEVC_REXT, "rext" }, #endif +#if QSV_VERSION_ATLEAST(1, 32) + { MFX_PROFILE_HEVC_SCC, "scc" }, +#endif }; static const char *print_profile(mfxU16 profile) diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 347f30655e..663f21439f 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -241,6 +241,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},