From patchwork Thu Jan 13 07:36:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33549 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp214934iog; Wed, 12 Jan 2022 23:38:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJyj6gK4O8+MuyDL6+FpESnaY8XS8Ud30x5GBLRRuQFOSa5w+oj9vz353GfhXVG3IC0TViIS X-Received: by 2002:a17:907:2d9e:: with SMTP id gt30mr2666105ejc.704.1642059530855; Wed, 12 Jan 2022 23:38:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642059530; cv=none; d=google.com; s=arc-20160816; b=nBE0coecn2pl/Hh2yzakMFjQ70sKkZUtl1V+wCckjB9wofm9xtLXFWeJA1QH8adY+H c+RvuUA7sEDulBj7az0PicakVPF7jo79rSb4cfxBgl/G9oBZMd8b8Bd3OOzKbGzHSa7C rq41C34WcPHupDFAOT25Pme5S+UlVsd63xNkmIhffyTZJCAai76d+GW2Sc7AOuuEjbnj 0onBTOL8tBc4yCMHJmUVrmST6RBbvfgl5YrselcmBVEbBsasXYF+uiXMpuSLPwWtzagm fquA1HezVLA1dVFRyNO7TpTUHKjzMrOasm6dnFBdGM8z/0EaF3FcTNl+DjuYGDi2zdbv h1JA== 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=kSVq9/7RhvyTWWLEIVzO58uvzVL38QqyEbbjsMr8N9k=; b=FFQegwMNvSVQ2zbae4C44Hy09tRCnHGPsX+++AgrbZ60PQiSm31GZMEBvpDa/2drPJ 5vmyc3CVJxIgsPeK4ETZoiGKH8iwnPP/2JoZzwOnCTfStOrGD6hnJSNe+UDWHtYICNBu MtNLGoXwT8qo6uDUoOslHQRtCv+wKMMWv1htEa6l99AYO383x7OnivaxIPmA58lKlY5t jf8S7IcgbNquNEjHTmzr5VE3IrUAa8Nv9LpYSBv3V+r8eR771wiWt1Y7yXC5EKjLdBdU 2ZAqqWtVkcTdqiHYrJwNQOJOqVjtsDsLznJ0VNQepA8zsoXakXnxYZuv/70ydk3Kibas kfng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="E/wFlug/"; 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 u4si1258153ejy.613.2022.01.12.23.38.50; Wed, 12 Jan 2022 23:38:50 -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="E/wFlug/"; 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 28BB268B660; Thu, 13 Jan 2022 09:38:38 +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 5A66468B4A4 for ; Thu, 13 Jan 2022 09:38:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642059515; x=1673595515; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=AW7Msj7QlQX9MI1VfUG8tQ2uPXCmQLCtssAzywdfFgY=; b=E/wFlug/hyBI6+ZybPIq+C0e9dxVslYcGnq/bjmQx936hSJSv2ANFS9/ 5vMMzOtqdHRRguhnNlpNDm/+Nn7Wrag7JCb5+dTKlhJJ7QDzIovsN3p64 d+QlbuXwfbPhJS3M5Q/b7OKgbERgq6nAVWMWKwYB4Nov4qmBp8HkW9jgT v5nlC6Ooot6T7Gfk6pxZY3zNiM6XlNdY8QfRAgjqvhj49giK5ACE/kUwO //9G873mj/8NEne28mOLjF3KRCtzIzQaEp45JTi4QtdoKnF3Sj9cqsEBu 3UMz+i/uB8k+8jmHzuh0g5QyYLAzpWthEVEdWK5tDdTWXMR+AUvRhfa5X Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="223933969" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="223933969" 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="576847893" 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:08 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 15:36:45 +0800 Message-Id: <20220113073647.114995-2-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 2/4] libavcodec/qsvenc: Add DisableDeblockingIdc support to 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: geL6ReVHSnBZ Add dblk_idc option to 264_qsv and hevc_qsv. Turining on this opion can disable deblocking. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 6 ++++++ libavcodec/qsvenc.c | 8 ++++++++ libavcodec/qsvenc.h | 3 +++ 3 files changed, 17 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 68921fbd40..6fc94daa11 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3299,6 +3299,9 @@ This flag controls changing of frame type from B to P. @item @var{b_strategy} This option controls usage of B frames as reference. +@item @var{dblk_idc} +This option disable deblocking. It has value in range 0~2. + @item @var{cavlc} If set, CAVLC is used; if unset, CABAC is used for encoding. @@ -3391,6 +3394,9 @@ Enable rate distortion optimization. @item @var{max_frame_size} Maximum encoded frame size in bytes. +@item @var{dblk_idc} +This option disable deblocking. It has value in range 0~2. + @item @var{idr_interval} Distance (in I-frames) between IDR frames. @table @samp diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index b3728d28d5..e87b69369a 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -346,6 +346,10 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, av_log(avctx, AV_LOG_VERBOSE, "FrameRateExtD: %"PRIu32"; FrameRateExtN: %"PRIu32" \n", info->FrameInfo.FrameRateExtD, info->FrameInfo.FrameRateExtN); +#if QSV_HAVE_DISABLEDEBLOCKIDC + av_log(avctx, AV_LOG_VERBOSE, "DisableDeblockingIdc: %"PRIu32" \n", co2->DisableDeblockingIdc); +#endif + } static void dump_video_vp9_param(AVCodecContext *avctx, QSVEncContext *q, @@ -889,6 +893,10 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco2.ExtBRC = q->extbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; if (q->max_frame_size >= 0) q->extco2.MaxFrameSize = q->max_frame_size; +#if QSV_HAVE_DISABLEDEBLOCKIDC + if(q->dblk_idc >= 0) + q->extco2.DisableDeblockingIdc = q->dblk_idc; +#endif #if QSV_VERSION_ATLEAST(1, 9) if (avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) { diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 31516b8e55..aa49b35f07 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -44,6 +44,7 @@ #define QSV_HAVE_TRELLIS QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_MAX_SLICE_SIZE QSV_VERSION_ATLEAST(1, 9) +#define QSV_HAVE_DISABLEDEBLOCKIDC QSV_VERSION_ATLEAST(1, 9) #define QSV_HAVE_BREF_TYPE QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_LA QSV_VERSION_ATLEAST(1, 7) @@ -97,6 +98,7 @@ { "b_strategy", "Strategy to choose between I/P/B-frames", OFFSET(qsv.b_strategy), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "forced_idr", "Forcing I frames as IDR frames", OFFSET(qsv.forced_idr), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE }, \ { "low_power", "enable low power mode(experimental: many limitations by mfx version, BRC modes, etc.)", OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = -1}, -1, 1, VE},\ +{ "dblk_idc", "This option disable deblocking. It has value in range 0~2.", OFFSET(qsv.dblk_idc), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 2, VE}, \ extern const AVCodecHWConfigInternal *const ff_qsv_enc_hw_configs[]; @@ -169,6 +171,7 @@ typedef struct QSVEncContext { int rdo; int max_frame_size; int max_slice_size; + int dblk_idc; int tile_cols; int tile_rows;