From 812b6ee6bdd1be7172af896088bd9a22eb538823 Mon Sep 17 00:00:00 2001 From: Wenbin Chen Date: Mon, 17 Jan 2022 13:11:20 +0800 Subject: libavcodec/qsvenc: Add DisableDeblockingIdc support to qsv Add dblk_idc option to 264_qsv and hevc_qsv. Turining on this opion can disable deblocking. Signed-off-by: Wenbin Chen Signed-off-by: Haihao Xiang --- doc/encoders.texi | 6 ++++++ libavcodec/qsvenc.c | 7 +++++++ libavcodec/qsvenc.h | 3 +++ 3 files changed, 16 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index acacf44d35..643bb3e4fd 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 4e15deaef7..99ec8c186c 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -349,6 +349,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, @@ -892,6 +896,9 @@ 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 + 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..08e902be74 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 = 0 }, 0, 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; -- cgit v1.2.3