From patchwork Thu Jan 13 07:36:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33547 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp214776iog; Wed, 12 Jan 2022 23:38:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJyebi/f5MpD6zOiNfUG/wZqVGG+DsdHqbZ6lnNzuz82gs0eHAVYsWKgqn7V/mksjbJUvvHN X-Received: by 2002:aa7:d813:: with SMTP id v19mr3006177edq.282.1642059513757; Wed, 12 Jan 2022 23:38:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642059513; cv=none; d=google.com; s=arc-20160816; b=FXj5b9SgnXBwgQM0wYAQaXoje5no3OiOZC6KH5ggrvBgdP2GPOVJBds4wlm480n1Ca UaTtbYDGuPr3nQSeBpJqTX5vKEca93Uf/3p93M/A+nY0XLqzyV9SQmjhWUOpRgb/xpyh UlUB2kPLKuB98MPpJpUbTNA449YHXs9sHnJEnNxYhVtQnvUQMEwGeaIN/mYimVy5du13 kMvlzvFaAyn25Ydr+p/qrAr1duR/4Gt3MQVVIT/6E3+CMgGwp1flDJhI/6ySwMJ0TNmr +KcIwy591UKFemKNkdGj4AdXGPD8Q5oJ3BjaXPutdqpcUT23Tzhw5SH/6tWXHA+7cSbJ 7uUw== 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=lHhoWMir8k0aEMpTL9sQnenwRYpiMbiJnKVdwsngpmo=; b=qL7TYe6rhKbhi/z5/DlK0Yn13uZMMBmnPdpNAdauHHa0keR7fD8vwbOcOtIcZYNQoM 2GRDj7M4HHgxd1GzBRbUaeXp81IjFO/3Ubo5TpK6kb9tDoj6S+/lZiG0QkF3wGqqEXT8 TPYtmSjhY6g3hD4YgGm/I+Q2yFzKLUE+h1Trgh+qkQxSRXS/3GuMKCoQ17zls/0fzLY5 Psf61uqEjgiqeFr+Hq47weA9kMCQbegqiJRVsmv4k5Df+C8GHK6/LOQAQRVJY/YvPOc/ kZgCGl+Yg5G6pjHQaUUBx1L/W6o1l2vvFuD+jcFs8NYrXd5ma64mDyK7Wx2RjUwLzBs6 LCnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=gdDOAjm2; 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 js21si1312470ejc.435.2022.01.12.23.38.32; Wed, 12 Jan 2022 23:38:33 -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=gdDOAjm2; 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 EF1F968B49C; Thu, 13 Jan 2022 09:38:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F14D36804B5 for ; Thu, 13 Jan 2022 09:38:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642059507; x=1673595507; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=hexL3HNzrTqkaLn7q9qgNjebAZQXV9QSNFyPY8+LHVU=; b=gdDOAjm2ne2pjfgoKfvZeoxKcJSdqtC16GiT8ZhaI00YT/akvCHq035N HY2y6cq/K21PaSzfP6jHAKcRm0cHU9yCNNPhh9k+5wl0zZ1XMfIHlpcEW a9wY3WKVEPKSzsV5DAJBJIWKDzlaiIVdNgE0Ps2kznnfreT8Uz+kCoSJQ zHD1UFCWFodNuLLQ89s9xYVwHU/kq9QM0UGKE3oyYkh/tOg7yyh34ruiU um/TX3o0G9rKJVyp8l3sOC48fNOMi0rVqHBURKNjCLpo3bTOuyIQcCUrn klVRPaUjin3KOYEJaYFyhKo1akBaFdXep4WtmVBI5R1DGuAVizPphPNM5 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="223933968" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="223933968" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 23:38:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="576847900" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by fmsmga008.fm.intel.com with ESMTP; 12 Jan 2022 23:38:10 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 15:36:47 +0800 Message-Id: <20220113073647.114995-4-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220113073647.114995-1-wenbin.chen@intel.com> References: <20220113073647.114995-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V4 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: +Iu2Edej+jgR 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 ICL. 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..66e4753c2a 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 ICL. @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 }, };