From patchwork Wed Jan 12 05:28:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33275 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4338813iog; Tue, 11 Jan 2022 21:30:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJxLAiAlJRnt7gJNiyWVuDF7tGnhH0/nP56T1DO370GhBviINwNa/PxIuvqiD+NS8xKRmpYo X-Received: by 2002:a17:907:8a04:: with SMTP id sc4mr6196649ejc.392.1641965448695; Tue, 11 Jan 2022 21:30:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641965448; cv=none; d=google.com; s=arc-20160816; b=JZuvSXHnltvuViZ5Z6RH0d5YKcPryuWC1nZfAqMqNbXGYMxTk+lmtTtXX5bw1MAiIN jS2wHZLgCcw0WujTnkrB1MZF885u3b71aN+bYB0cDDDgpVwQPw78xv8vB4XT0YzIZfNc I9eum0eTb71KhdGG9TM3yaIaMaUEzdHnUfda157ISR+ZNf+NiFgWZHpk78Uee/ZZwWtO 8vwchC3Z4M8TO74UMx9gZ+slvqypC0uSndfPga49QfvYJhNADYslq0g02F7QFnk6GvGK Hm8Wcmh4yS6avfLZ5WYwcAxogsfS4VqtqygG90Z6aXbof/iPRIvNsHIiBgarDVYrdRLn mybA== 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=QXrNpNQXSklhxgZ0KiVdcaVd6NgKZTb8ZAmJTe+GQi0=; b=HuN/wZZEBMXZo4VcGfwmqJpid8VZLiuCYqK40p365Be1xH2bqIhy6scssvEab9rpQf v4061JPQWDV22Yf7syI0Rh89QHPNQTY6BV7u/GRXTCHyltrJBfCE3GYY+7wgCQIFFTfD gZqwVR424ctDgLN0pNOp08X1tpMvpp2pj5mMZDp4YO/GJRgZ5IBaYpauNn7r8zkD1NVf 8NLQosySCglGqdOZJywbNCPEI2jCXsvWiUFlNh+esLG6mBDIGYhGPMNfaa6Fe5Zb0eqU uZBmazO8b3vspMI5Q5wjv5UD6RTICm2iMYScuE4ut+o3tQOpbS3cI5w20wKefLyi5HiL ty6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=RZl9iqJ4; 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 m22si646591edq.475.2022.01.11.21.30.48; Tue, 11 Jan 2022 21:30:48 -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=RZl9iqJ4; 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 5388868AECA; Wed, 12 Jan 2022 07:30:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8347168ADDC for ; Wed, 12 Jan 2022 07:30: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=1641965417; x=1673501417; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=GMGCJodBIciJzu16r0vZM+I8TdFkMego1OW1+NkUneo=; b=RZl9iqJ4k0/Y70za0eUmgKQrBt8f+ml4Yoh0aseraOaF5McPYrOevO8u IcOgX/hsQZGdxju+SCppIkNegi3rfMn27bYJ8C/eJIq4mmJeB7gFhX5ZA DLKlufxPJQWG22IeOgqzvspvLf0fbn6v+VIeE4XPzBoSVAch6/g7VZgkx bZ98o9YC17/W5wgJd9rH7FSRb2hrtz86tbdvvT/LOMDnpBmyrJdlfBPrL LsCp7iFvkpn+cV+fKJY8lW/cG7Mw7TwA3s4gAEfSyRgUB1NrEcf+LIwqo d3T5ARNxi9ZGEOmFWv0J534pQkmUOKXxXSPtCFM6w+mIkMauiUqBhqeiI g==; X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="241215387" X-IronPort-AV: E=Sophos;i="5.88,282,1635231600"; d="scan'208";a="241215387" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2022 21:30:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,282,1635231600"; d="scan'208";a="515357882" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga007.jf.intel.com with ESMTP; 11 Jan 2022 21:30:06 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 13:28:50 +0800 Message-Id: <20220112052850.1147160-4-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220112052850.1147160-1-wenbin.chen@intel.com> References: <20220112052850.1147160-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2] 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: XSv3fdgMVFq5 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 only supported in the platform newer than ICL. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 3 +++ libavcodec/qsvenc.c | 10 +++++++++- libavcodec/qsvenc.h | 1 + libavcodec/qsvenc_hevc.c | 3 +++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 3d7c944fba..96e088f6ac 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3447,6 +3447,9 @@ 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. @end table @subsection MPEG2 Options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 5f405c3d3a..2d0e13c91a 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, @@ -966,10 +969,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 }, };