From patchwork Wed Jan 12 05:28: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: 33272 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4338576iog; Tue, 11 Jan 2022 21:30:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyDJNPFfRJAIHWok3Z4/bUitHPxK+h6TQemAfB9wmugp0bl98n1x+nMGQ+jLv4yEgEbZRo X-Received: by 2002:a17:907:160b:: with SMTP id hb11mr6663390ejc.189.1641965420585; Tue, 11 Jan 2022 21:30:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641965420; cv=none; d=google.com; s=arc-20160816; b=Ckh8KjW0BL+q2o2yF+C+XN4ZeqbzLa7xKlbSF7rcz8mX41OP+0uHDbo91nSMH1p9jx XH8EDzGsHL6Km7i9BXAJKUQfMDbuXab6CpxS4IvwenfAK8yYx3X4XP471JVg6xN+/tLf A57/lJ+UA3f+73PhzQ9Gduz4j2tpKbJJtmeQOE3H+kqcLPJelk2s1egMX4PPMCq2XutG a50VNFl3GaPIDfoN/oMsfX76oZwCyANlHi0L08l+orRNzxoiwfi14dmh86n0CioVfsyh KZdUsFU9mE65Osa2FSiSqlRDkKf7a0RBmXn3CoslfQGtQgn0J3nm5oqRnVxwMXkw9+b+ BL7Q== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=m3JlvtbqfqX6caXT1HPtsAvDkMR8WZtGTKU6Z/IGc7s=; b=WediAsto4lNQehNZsTwK1D86ZtX2l7qHHFfgKMbpK5fIDXt5OnPkF6aqdqynnq+jLP lQMBiCTv1J8H6z5nlLPQy8UjbJ6RZN2kpM/p1VS1QkIkDsGHoBrfSOMvb4wYwT/Xz/pF xrfs+aku0t5EQvfGiUTD3oMJGTqOOHE8D404txyBYymBlOvtr+NIzI5PQHMFMOLf4Qdn OvdXQ1T48qtko7N+QSf+VGH2hvz+OUKfPmpDpuw4v/34B2J93lGUA941fcx4RLjxA/90 /kmdHVCk73qnkq8XscVRQRnatGNI3SoQgE5Eg0U6iL0VpeB0me5vQUoOmkRIhWrx/I+9 El8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Ju6F1bhF; 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 ji11si1627660ejc.417.2022.01.11.21.30.18; Tue, 11 Jan 2022 21:30:20 -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=Ju6F1bhF; 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 57EC468AC4D; Wed, 12 Jan 2022 07:30:14 +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 9F280680BA3 for ; Wed, 12 Jan 2022 07:30:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641965411; x=1673501411; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=yw1cb1g5wBAleEDBgPQNZq6LVv5JmFHSecocDpVKc+k=; b=Ju6F1bhFtaXAx+HpiD36eOkL4slvgKiKMKTDmIDCw2ziaEN7OJgl6I7C GY6HTMKxMo7kjtZZkBTM/+IF5nWIxkwwX+EF0nuPwUUmubemqkIK5iM2O HlUKf6XFOweiyzvfzJOf7ls3W0GZDcgOOVfKaW8XiFv93aa6qxT8GSMHu 3+5CaqQLJ/NQehdAitShELdhw8heB4q8xOSVZIt4OaM4ayFBA3LeulxP8 z0pWZmbArBskX4CnPXs1bJqTSa/pADllp48KCv7ExWqzGDkezBNkReRgo txFY4KzfWSv0B8uRa3lNq3rf37T9BYJipuOrwrjQFGL7cTOixleqBkRZw w==; X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="241215382" X-IronPort-AV: E=Sophos;i="5.88,282,1635231600"; d="scan'208";a="241215382" 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:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,282,1635231600"; d="scan'208";a="515357848" 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:03 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 13:28:47 +0800 Message-Id: <20220112052850.1147160-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2] 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: tkQ78DzFBR9e 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 a13718652e..3a51d00ca9 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, @@ -885,6 +889,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;