From patchwork Thu Jan 13 05:12:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33545 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp132824iog; Wed, 12 Jan 2022 21:14:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTYsU+rJ3zVCM8BSXokT7kHj+5QpZ4NNXKUddFkeGPtSMEkeAu+NpcRvZ05kbblV1Ksr01 X-Received: by 2002:a17:907:9810:: with SMTP id ji16mr2313155ejc.202.1642050882164; Wed, 12 Jan 2022 21:14:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642050882; cv=none; d=google.com; s=arc-20160816; b=w16Bl9+NFRfJ96hrnXKDv83SyD9RnI7N9bzSX9wEjHNywGlQGoBcFNUilgeZQmAkk5 t6Hnv0+RFtoCeC45fP1qvYDdLLh+pNByF3JkDKKVu4uXYVBfd2OjfAc+Ga5dDpWg2xDF frUk7m/0qqvn9wRHJ8y9+rdR2LIvfXFfBFPvRPjfMVFdLqOsG/V1RuRUnfSq8xkRIVQA mRxV7mYZSsuw4PIr6NsUZv8pAdDtw7FGMllPE27VkRs5UhMyfcSkpBa/fKuwxCJIg+lZ /rTs6mdBut+eUYJ8eAQaL7/Vj3jg3uy44+D9T/oixmgU1mqlHF080knPyFPY9kht6EMr p2Lw== 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=V9twL0vTEyLFbgiKJ9w/MQyxkOGpf1n5+dJq8v/Olp4=; b=0c93lYDYx2sYOMouewfvca8SlptWAnSBHR1MVvLmWVy6nPgqDLbXRAR6A7sXHA5uGh 6d3D5XWHPGHWFiwH0pudsXrr5lYWTc7k34AT5u/De2MGcStlk0ckfPc4z7ALWcZ6L/J5 YaHvWQNrz8zzhIExocR8Vidvr6KOOfsPUP7JMrpuf4oUnE2X54K8QJhj6bk++/w2xTzR /Rsw3t9w+mvKfe0phLb5MZf+w141GHZZhpl3ZDRVOY13pQuM0b3qqW+Tkh1Pg7b5ekaa q/dEPwHMtUaTLNRECX/ER2/sLfwEpo36uE0Pb25/deaVWmQViIAlE/u9dWCTlNGyMPm4 TvMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=k+hnY2Ob; 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 hv22si904969ejc.594.2022.01.12.21.14.41; Wed, 12 Jan 2022 21:14:42 -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=k+hnY2Ob; 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 E61D068BBA0; Thu, 13 Jan 2022 07:14:19 +0200 (EET) 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 7EA0668BBA4 for ; Thu, 13 Jan 2022 07:14:12 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642050857; x=1673586857; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=U4zvllsmedvrFmGE7Drb/gRmcavgt/n+bsrzpUypPn8=; b=k+hnY2OblFsFU97G/cu9fRivcIoofcb0I+Frw848Bvif2CCknfz8xbh+ OoooZMgPvCdZcKNwxTr37y5Cf2BVjanE9cUcIHL6PPw2v0ao8j82sFUTt 6nFKpyGPnLaswjJZADJeGLXO6dXHKny6nQ5wi3ighkHJwgegS3WlILGdQ FX0cmXcE8ZIKQqyn4AJEzEM6SI0xu6G089RcBHK9BjN+vmYu0jKf6FDlO h3s4mwwIFHMgdvuJF/p84d5jDdonvXmm0+jOqYeW93n1LL2fhi3vAovCa nMwnmlWQFkHoRZ6UU7cAPmd0xOAoNDAlUqF0DAdB6svVe5tIreBFoeV2U A==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="244138139" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="244138139" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 21:13:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="623736741" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga004.jf.intel.com with ESMTP; 12 Jan 2022 21:13:43 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 13:12:21 +0800 Message-Id: <20220113051221.66453-4-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220113051221.66453-1-wenbin.chen@intel.com> References: <20220113051221.66453-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V3 4/4] libavcodec/qsvenc: Add transform skip to hevc_qsv 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: IeJPK2KeTWyR Add transform_skip option to hevc_qsv. By enabling this option, the transform_skip_enabled_flag in PPS will be set to 1. This option is supported on the platform equal or newer than CNL. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 4 ++++ libavcodec/qsvenc.c | 10 +++++++++- libavcodec/qsvenc.h | 1 + libavcodec/qsvenc_hevc.c | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 3d7c944fba..7714084864 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3447,6 +3447,10 @@ Number of rows for tiled encoding. @item @var{aud} Insert the Access Unit Delimiter NAL. + +@item @var{transform_skip} +Turn this option ON to enable transformskip. It is supported on platform equal +or newer than CNL. @end table @subsection MPEG2 Options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index f2ba0241c6..4e5997c9ed 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -358,6 +358,9 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, av_log(avctx, AV_LOG_VERBOSE, "DisableDeblockingIdc: %"PRIu32" \n", co2->DisableDeblockingIdc); #endif +#if QSV_VERSION_ATLEAST(1, 26) + av_log(avctx, AV_LOG_VERBOSE, "TransformSkip: %s \n", print_threestate(co3->TransformSkip)); +#endif } static void dump_video_vp9_param(AVCodecContext *avctx, QSVEncContext *q, @@ -970,10 +973,15 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) #endif } + if (avctx->codec_id == AV_CODEC_ID_HEVC) { +#if QSV_VERSION_ATLEAST(1, 26) + q->extco3.TransformSkip = q->transform_skip ? MFX_CODINGOPTION_ON : + MFX_CODINGOPTION_OFF; +#endif #if QSV_HAVE_GPB - if (avctx->codec_id == AV_CODEC_ID_HEVC) q->extco3.GPB = q->gpb ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; #endif + } q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco3; #endif } diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 960604cb9a..5a574ada30 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -200,6 +200,7 @@ typedef struct QSVEncContext { int repeat_pps; int low_power; int gpb; + int transform_skip; int a53_cc; diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 08aba3011d..679c09c858 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -251,6 +251,9 @@ static const AVOption options[] = { { "tile_rows", "Number of rows for tiled encoding", OFFSET(qsv.tile_rows), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, UINT16_MAX, VE }, { "recovery_point_sei", "Insert recovery point SEI messages", OFFSET(qsv.recovery_point_sei), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, { "aud", "Insert the Access Unit Delimiter NAL", OFFSET(qsv.aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, +#if QSV_VERSION_ATLEAST(1, 26) + { "transform_skip", "Turn this option ON to enable transformskip", OFFSET(qsv.transform_skip), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 1, VE}, +#endif { NULL }, };