From patchwork Wed May 25 13:13:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 35924 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp1062557pzj; Wed, 25 May 2022 06:14:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxpZopQe1xBaKH4LkGoQw8FViLVD28rbS/rP6sr3xE9UwRRHel5ET/6Z9jTDMMFEagWskV X-Received: by 2002:a17:906:58d2:b0:6fd:daa7:3a6e with SMTP id e18-20020a17090658d200b006fddaa73a6emr29070501ejs.0.1653484454295; Wed, 25 May 2022 06:14:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653484454; cv=none; d=google.com; s=arc-20160816; b=q0wlivnNcYPHH96r2wUoxtXmM8VY+z2mZc0tw427uNYcEugftT80gjng2Zk2zpMId3 aHF/tC5Rez2V4RolIImythhzGjJ/pkaYIN0ZTBBa3VXryTMYjrh16sX/VxdAJyhmmvHT QEXwYzvHmOYwEIczHfxZjnCrc0PJ3IIvHka8uQVjtX+JrfKY78Y3JrIV7QycdZjMnK3q bo1Qd6b2PgQjoVeNkD3q1cBLBK8e+bne3YJaTYROLwfYe8uLKwEqm6WFTet1R3iDtNQa Xw44giPe7xPVkrKZgMtMN7jQDf5bkOf9fSdgmJrv1+6oHWDkta4gDcr5ci7z7nG7jCNp ER0Q== 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=aa51FUykGFURJjhBIFLob7NfLz1lpGsYaF3UhPvkXQs=; b=lU1uowq4pwFgOTL6MDD5K9tbQcYHURvWzHSUZv3NzsgapxSxRr1W5FY4AXQOL26Xz8 axCkQrTPvB2F/pyxTNvvIm9Njjv5rA4NF582cN9m2JSHD8jaSypFyj6l4NUKZYdVtWJw m17oBbXcJrVYty1i30MfIjnQZZuBNEo3sN3oxj/DcYmPlMkkP8YQWmyNwYw/pUfi9vsO mpnRlp4oYWKP5qCkYtQyZ6EVsElpRbjN0RnyD805vdFVtFiohU9MXldsoZu+j7GCA6ut MIF5J+nkCdR9oxe95H/+iUa4QLfbC1eWpv/cveHwIA/c1asvBXw8WjyJiFwrj2ZuJzqd xTwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Y1A+QJDn; 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 cw7-20020a170906478700b006e8c309996esi22147111ejc.551.2022.05.25.06.14.13; Wed, 25 May 2022 06:14:14 -0700 (PDT) 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=Y1A+QJDn; 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 AAC8D68B504; Wed, 25 May 2022 16:14:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFD8368B488 for ; Wed, 25 May 2022 16:14:02 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653484448; x=1685020448; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=y8hmshjbdvJVnuJQmLLRCXOwVIAa/5+SH3L47UAhdEE=; b=Y1A+QJDnr+Xi1L+R8xQNC5Ifprkj62cdF+MbAoj3AYzMHOYag6JUmgBc 07LapmjfuKXxrVeg0kpMB5Vtn3N/iy826PEDTohHWMzU3ZJEkxNzL2mcs SLGDPZATZ7h4YGvOvbc5Ga5wW9QLkpeddhRv9Qy2xix/M3byZSKaE8JO1 WCZES7X0chUlgyDRiu0/vPHZq4K8DCMNLEkLfKtItsTE0nL1ObrvQTWD+ mZanSVda5dsqZ+DXpE1Dv+OE4V+nSMLkjgPxgKsAP+Y4jw3xqjfk7lsIi ELLWAiLNoIW3+6tCjtVl1heKTdbNy9NYcWj7Pgs2fb8qz8r4gzFS87PgY g==; X-IronPort-AV: E=McAfee;i="6400,9594,10357"; a="272627608" X-IronPort-AV: E=Sophos;i="5.91,250,1647327600"; d="scan'208";a="272627608" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2022 06:14:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,250,1647327600"; d="scan'208";a="549018456" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by orsmga006.jf.intel.com with ESMTP; 25 May 2022 06:13:58 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 May 2022 21:13:41 +0800 Message-Id: <20220525131341.3203743-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] libavcodec/qsvenc: Add min/max QP control options for I/P/B frame 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: 3sBJTM0Xeed7 From: Yue Heng To do more accurate QP control, add min/max QP control on I/P/B frame separately to qsv encoder. qmax and qmin still work but newly-added options have higher priority. Signed-off-by: Yue Heng Signed-off-by: Wenbin Chen --- doc/encoders.texi | 36 ++++++++++++++++++++++++++++++++++++ libavcodec/qsvenc.c | 21 +++++++++++++++++++-- libavcodec/qsvenc.h | 15 +++++++++++++++ libavcodec/qsvenc_h264.c | 1 + libavcodec/qsvenc_hevc.c | 1 + 5 files changed, 72 insertions(+), 2 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 9796a606fa..e9df36de8f 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3472,6 +3472,24 @@ Multi-Frame Mode. @item @var{repeat_pps} Repeat pps for every frame. + +@item @var{max_qp_i} +Maximum video quantizer scale for I frame. + +@item @var{min_qp_i} +Minimum video quantizer scale for I frame. + +@item @var{max_qp_p} +Maximum video quantizer scale for P frame. + +@item @var{min_qp_p} +Minimum video quantizer scale for P frame. + +@item @var{max_qp_b} +Maximum video quantizer scale for B frame. + +@item @var{min_qp_b} +Minimum video quantizer scale for B frame. @end table @subsection HEVC Options @@ -3595,6 +3613,24 @@ range is [-63, 63] for 10 bit-depth or [-75, 75] for 12 bit-depth respectively. @item @var{int_ref_cycle_dist} Distance between the beginnings of the intra-refresh cycles in frames. + +@item @var{max_qp_i} +Maximum video quantizer scale for I frame. + +@item @var{min_qp_i} +Minimum video quantizer scale for I frame. + +@item @var{max_qp_p} +Maximum video quantizer scale for P frame. + +@item @var{min_qp_p} +Minimum video quantizer scale for P frame. + +@item @var{max_qp_b} +Maximum video quantizer scale for B frame. + +@item @var{min_qp_b} +Minimum video quantizer scale for B frame. @end table @subsection MPEG2 Options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 2b3b06767d..03e9e5523d 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -828,8 +828,13 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (q->b_strategy >= 0) q->extco2.BRefType = q->b_strategy ? MFX_B_REF_PYRAMID : MFX_B_REF_OFF; - if (avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) { - av_log(avctx, AV_LOG_ERROR, "qmin and or qmax are set but invalid, please make sure min <= max\n"); + if ((avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) || + (q->max_qp_i >= 0 && q->min_qp_i >= 0 && q->min_qp_i > q->max_qp_i) || + (q->max_qp_p >= 0 && q->min_qp_p >= 0 && q->min_qp_p > q->max_qp_p) || + (q->max_qp_b >= 0 && q->min_qp_b >= 0 && q->min_qp_b > q->max_qp_b)) { + av_log(avctx, AV_LOG_ERROR, + "qmin and or qmax are set but invalid," + " please make sure min <= max\n"); return AVERROR(EINVAL); } if (avctx->qmin >= 0) { @@ -840,6 +845,18 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco2.MaxQPI = avctx->qmax > 51 ? 51 : avctx->qmax; q->extco2.MaxQPP = q->extco2.MaxQPB = q->extco2.MaxQPI; } + if (q->min_qp_i >= 0) + q->extco2.MinQPI = q->min_qp_i > 51 ? 51 : q->min_qp_i; + if (q->max_qp_i >= 0) + q->extco2.MaxQPI = q->max_qp_i > 51 ? 51 : q->max_qp_i; + if (q->min_qp_p >= 0) + q->extco2.MinQPP = q->min_qp_p > 51 ? 51 : q->min_qp_p; + if (q->max_qp_p >= 0) + q->extco2.MaxQPP = q->max_qp_p > 51 ? 51 : q->max_qp_p; + if (q->min_qp_b >= 0) + q->extco2.MinQPB = q->min_qp_b > 51 ? 51 : q->min_qp_b; + if (q->max_qp_b >= 0) + q->extco2.MaxQPB = q->max_qp_b > 51 ? 51 : q->max_qp_b; if (q->mbbrc >= 0) q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index fec5e584db..b754ac4b56 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -100,6 +100,14 @@ #define QSV_OPTION_LOW_DELAY_BRC \ { "low_delay_brc", "Allow to strictly obey avg frame size", OFFSET(qsv.low_delay_brc), AV_OPT_TYPE_BOOL,{ .i64 = -1 }, -1, 1, VE }, +#define QSV_OPTION_MAX_MIN_QP \ +{ "max_qp_i", "Maximum video quantizer scale for I frame", OFFSET(qsv.max_qp_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, \ +{ "min_qp_i", "Minimum video quantizer scale for I frame", OFFSET(qsv.min_qp_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, \ +{ "max_qp_p", "Maximum video quantizer scale for P frame", OFFSET(qsv.max_qp_p), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, \ +{ "min_qp_p", "Minimum video quantizer scale for P frame", OFFSET(qsv.min_qp_p), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, \ +{ "max_qp_b", "Maximum video quantizer scale for B frame", OFFSET(qsv.max_qp_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, \ +{ "min_qp_b", "Minimum video quantizer scale for B frame", OFFSET(qsv.min_qp_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, + extern const AVCodecHWConfigInternal *const ff_qsv_enc_hw_configs[]; typedef int SetEncodeCtrlCB (AVCodecContext *avctx, @@ -209,6 +217,13 @@ typedef struct QSVEncContext { int co3_idx; int exthevctiles_idx; int vp9_idx; + + int max_qp_i; + int min_qp_i; + int max_qp_p; + int min_qp_p; + int max_qp_b; + int min_qp_b; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q); diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index cf77ea575b..87b09360cb 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -114,6 +114,7 @@ static const AVOption options[] = { QSV_OPTION_B_STRATEGY QSV_OPTION_DBLK_IDC QSV_OPTION_LOW_DELAY_BRC + QSV_OPTION_MAX_MIN_QP { "cavlc", "Enable CAVLC", OFFSET(qsv.cavlc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, #if QSV_HAVE_VCM diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index a6bf39c148..da2bf457af 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -233,6 +233,7 @@ static const AVOption options[] = { QSV_OPTION_B_STRATEGY QSV_OPTION_DBLK_IDC QSV_OPTION_LOW_DELAY_BRC + QSV_OPTION_MAX_MIN_QP { "idr_interval", "Distance (in I-frames) between IDR frames", OFFSET(qsv.idr_interval), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT_MAX, VE, "idr_interval" }, { "begin_only", "Output an IDR-frame only at the beginning of the stream", 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, 0, 0, VE, "idr_interval" },