From patchwork Tue Jan 26 02:32:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 25182 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4D62044BD9F for ; Tue, 26 Jan 2021 04:36:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D1F268920B; Tue, 26 Jan 2021 04:36:09 +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 1B07B68816E for ; Tue, 26 Jan 2021 04:36:00 +0200 (EET) IronPort-SDR: oLJbg4nm+DRfUh/bugDTxmPDsn2UW1zQ72wpF+bgutjPOeVzZS5A1+jX3asipOF297qrCxPbDy HvCS+WeXv91w== X-IronPort-AV: E=McAfee;i="6000,8403,9875"; a="159015216" X-IronPort-AV: E=Sophos;i="5.79,375,1602572400"; d="scan'208";a="159015216" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2021 18:35:59 -0800 IronPort-SDR: v5Mdr1PxWRvOhOrDADAKGL8Z+2IxleRxe31Cmg+xviMRsXhH39xBDzyeEOUIrfJveyaWDZ6Vvd m3ue1F1RKdLQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,375,1602572400"; d="scan'208";a="361797014" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.3]) by fmsmga008.fm.intel.com with ESMTP; 25 Jan 2021 18:35:58 -0800 From: wenbin.chen@intel.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Jan 2021 10:32:05 +0800 Message-Id: <20210126023213.146185-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210126023213.146185-1-wenbin.chen@intel.com> References: <20210126023213.146185-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/10] libavcodec/qsvenc: add DisableDeblockingIdc support for qsv X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Wenbinc-Bin Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Wenbinc-Bin MediaSDK already has a flag to control deblocking (DisableDeblockingIdc). Add dblk_idc parameter in ffmpeg to expose this flag to user. Sigend-off-by: Wenbin Chen --- libavcodec/qsvenc.c | 6 ++++++ libavcodec/qsvenc.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 0bca4f30e3..2434feb660 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -295,6 +295,8 @@ 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); + av_log(avctx, AV_LOG_VERBOSE, "DisableDeblockingIdc: %"PRIu32" \n", co2->DisableDeblockingIdc); + } static int select_rc_mode(AVCodecContext *avctx, QSVEncContext *q) @@ -710,6 +712,10 @@ FF_ENABLE_DEPRECATION_WARNINGS if (q->max_slice_size >= 0) q->extco2.MaxSliceSize = q->max_slice_size; #endif +#if QSV_HAVE_DISABLEDEBLOCKIDC + if(q->dblk_idc >= 0) + q->extco2.DisableDeblockingIdc = q->dblk_idc; +#endif #if QSV_HAVE_TRELLIS if (avctx->trellis >= 0) diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 6d305f87dd..3720320789 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 = 0}, 0, 1, VE},\ +{ "dblk_idc", "value of DisableDeblockingIdc (default is 0), in range [0,2]", OFFSET(qsv.dblk_idc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE}, \ extern const AVCodecHWConfigInternal *const ff_qsv_enc_hw_configs[]; @@ -167,6 +169,7 @@ typedef struct QSVEncContext { int rdo; int max_frame_size; int max_slice_size; + int dblk_idc; int tile_cols; int tile_rows;