From patchwork Thu Feb 8 07:39:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 46107 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp102844pzc; Wed, 7 Feb 2024 23:41:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IGvpM9B3dVfzwfBToDOAgeUU8AXmAng6GV5YBBf/DfWEbNsk74a421Fva5Y2RC1OpFq1djq X-Received: by 2002:aa7:c2d3:0:b0:55f:95ac:d698 with SMTP id m19-20020aa7c2d3000000b0055f95acd698mr5737532edp.32.1707378065926; Wed, 07 Feb 2024 23:41:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707378065; cv=none; d=google.com; s=arc-20160816; b=y0ZF+uucVCLJTFLQfFtUG6xGvqpX++hhnY0nIsOWJhQpzOFLSyvtnKBMND7/F1tWQC 5sXx40DWkbR0Di5j3FVRP/C5S001q2vH8e6CrMvyI9dy0+E6OOLI/ApMuOA4/EEZ7seg pEguuJQ4SizHvBlWTXOvVzjFJLs51gL/4WheWYI/8cjkQbf349f2fqYMkw2Ghk6aByU9 /Sx/OIJDwuC31o0Po0uYoGXfRKqGdX//96/MuuEAeQwLpLJL4jIdHGh15fzw2O/Kw2C2 n46hykc8OH5t43PgFye+ZpZbcAEK7dKbxvfrp/jzxtcFn8IXZDsooqhpczmym8mjhKpM rHCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=XEnj5pb9yXMI8EapWBBGsZ0rdWXdHo65zzxyE+rQ0gg=; fh=mDx07aZ+dH8J9oUwnaZihouZUMNpRCr7MwXJxyzjoH4=; b=M1nrI8eJw8lRAo8oKtI3tuQbDy/LKHw6ivScxKD1I07coKKHQZCPq1Ax4qnXJRRZQ9 JR/9bmml4fl2N9FcnpD3VyrgMRWXToiDsGN6YCZCR9FstSB96BJ70wcckAAdWTqvhMqb zOexx1Eo0N+hdn6cm8Ue8VCUKVMTAlbPxal5E5n+OUwQ0WDboTMBRFYXtl+PTJ8Qz5T8 4mrNnVrIcs/DQHxuE7XyOMp+/dGzLRnK8zAGXv5Qf/UI562LS6955LxPP9PGKWtxS4X3 jwt+QdOJgrJuIae70i28iuEMmseQYTTipkVS9cmANmHDMnJTskWpgWgMLUudIDWSUsOA 7rgg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LbB2dsOU; 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 X-Forwarded-Encrypted: i=1; AJvYcCWGkiBVT4F/LYKYK/DnMCuyb2QNBmhLKc/qaz02zNoN6kZ/DTxZScQojDYfzVv23xcX3xDcKtR2nuabgMGmh82D3ryqQHKAs5e5pX7QbFVkVl3rFplfZQDKUxUDDc2VGJnfv0RgGpRzF9a7qUS+KMtHhBvj4MhM+FlfkzqJ+K39oj51nd2SJHhtQWGWSiKH3hm8iilI4hj5QyQgxiSLVkT++7psK8iSnQtwAY9jWnAawzpzFh9vtHw+5V95xMx5iYOXPvudncchx8gOsNwWE1P23oe2lkBYw0IG6/Du+967Oia26OIDCej0BT/lYAeWMQGEWDqN6kZBDemOkL8nXEaX9vPB0tUbS4fGiqyMqHXfiMb5JulvygIdN7vXPFilFMCSk9dUMgnDZ8L+3BAx+4fOSl8NIwUWJM+dXhJGzbiMViMUNIJkluD3POkcpqP8dS2EhGYcmb3s3f2xNkz6J/2K/duWOZVDlDpQLeCOKBs3s8G9rZBcsKGOjKQUpICEnHGzwdmDfGbv9js0WS1CbaLB82dzSOlv5F9x7j193Vg2ibVcjq4PCayc5W3y7N8TKdj5kv5ZLONqQC6FshAIZOU0lzzs1GW9wJKeBZeiX4bQIOvZW7yTr+D9TOpUckOLh3aWWjhEwLKS+k6bGQeKws1/QLO/PlI7WFGG5qpY9IFPb9xK832OElBmAJV11FvKN6VA7p19zDUTm9bLZYSIM6CL7W+HS94KiXk2zoE5pGeX8gJYmMT6tLPTMJHFAfAUwyfuR4zDOANcJ1FBfTsH52jD83KS8DgZevr7aKrzCX6kJMq+30e56EuHgd9SZUSfC7iVh2NyydHLvIB/EJkQ3pDaTGs+BEvlYoNZv4d+INZSNEX30ByZhZY4XBpMIyOkRV8olmOBCdgDKQ2JF0a7FM3mfcqlHJ1uKeqi877EW3nMBNdLH4A47wLQ5DWFKaqMNLAhL7 SUSQZNlA8GDtNGiw6GoPVmlA8cWJxru2HgGFEw+9d35FIqDkNkZsZAS8qlThii/aJHRQt/ze+0ps+61ksRT/0jXkrzEIov68FTvUfe21K5n82ebyp2KXhoaXh2CbJXsfVyUvG9cIROWc//EZ/ejNxd5fq/uHvskzq2gxz7sDOJmPabFWP3DycBjfOVDSVLAYLxOIjOkTnwVEUF3kZXOabApFeEMyLybuqimRb/GsEZyQtxgPQXanzeVfAL1LdQjJ+1sqzXJOOU0gct71QxrAwPRioahUjZyLvczW712K67jhZBZlccYRRP+gvskT7C59U0eZHpWb21AwJv1/8mXRuNtd30kBbJcOl8qzNKOSXx5KuIBglHuk34JGoaWknON5dOGQeJniYHEf9luWlkvBZKM3tNaEakV9yWBgNfei6tpQsCRl9bQ4j/NTYGyFNHpkyeHJUlqkbhkqHFnk0bN1FHXK5HNkO3Jjfpqpde/d4Vkb92snq0xv/ekkeJAo7SRFjZIS+r/cbZVMoRJkXlF4H88l2Vp8ZNpXIU6TX2Ehp7J4AUpY8xPW+A7pdYxvGli1a4iCF7/ZDn3h5bXUgI0YzJlowHBLU0Ew== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g22-20020a0564021ed600b0056110ae2c93si249509edg.503.2024.02.07.23.41.05; Wed, 07 Feb 2024 23:41:05 -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=LbB2dsOU; 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 DEC0F68D1CA; Thu, 8 Feb 2024 09:39:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5701368D1CF for ; Thu, 8 Feb 2024 09:39:52 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707377993; x=1738913993; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=U6SSSG0ojEXjPPSc+iDBat6uRV8FTVBGyUSaspazsrM=; b=LbB2dsOU/uo0l0wev8jbIIo4FGZx6++nCg/u9IAZEpUBQ+mbAHEvsma8 eHT6wwfZuoV3OvaIBzSfOp114VX8Ly22fCyiwnUCcebwImDDrUjch8n5s OWP/mLmmmoptHp/cA4Sy9lh4mSSx1vX2TLwzHNoV9kRZOAoaMC8rgX1Q3 TzzA5n1+txukhPjspL+z6wv5BYhxBuGhWu29h31WvpSUvP9cvfUYpGzHq srihI4uGEGNaZ7wzjaHEM8JAXvy2H6tdlS7PnL7TKpJZxMgrnXiCMGB9j hcqSQP0Y9D+ryRYbqDA4UFxiXMZ+9ak8SfuQGc2c4c4GYlID4k5rT2j/f Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10977"; a="18586599" X-IronPort-AV: E=Sophos;i="6.05,252,1701158400"; d="scan'208";a="18586599" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2024 23:39:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,252,1701158400"; d="scan'208";a="1876328" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2024 23:39:49 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Feb 2024 15:39:36 +0800 Message-Id: <20240208073936.1246837-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: update the selection of bitrate control method 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tDA7m8GrilW4 From: Haihao Xiang The default method is changed to CQP Signed-off-by: Haihao Xiang --- Changelog | 1 + doc/encoders.texi | 7 +++-- libavcodec/qsvenc.c | 59 +++++++++++++++++++++++++++------------ libavcodec/qsvenc_av1.c | 2 +- libavcodec/qsvenc_h264.c | 2 +- libavcodec/qsvenc_hevc.c | 2 +- libavcodec/qsvenc_mpeg2.c | 2 +- libavcodec/qsvenc_vp9.c | 2 +- 8 files changed, 52 insertions(+), 25 deletions(-) diff --git a/Changelog b/Changelog index c5fb21d198..b9e4536233 100644 --- a/Changelog +++ b/Changelog @@ -24,6 +24,7 @@ version : - ffmpeg CLI options may now be used as -/opt , which is equivalent to -opt > - showinfo bitstream filter +- Change the default bitrate control method from VBR to CQP for QSV encoders. version 6.1: - libaribcaption decoder diff --git a/doc/encoders.texi b/doc/encoders.texi index c9fe6d6143..d1363c2174 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3332,8 +3332,8 @@ quality range is 1 to 51, with 1 being the best quality. @end itemize @item -Otherwise, a bitrate-based mode is used. For all of those, you should specify at -least the desired average bitrate with the @option{b} option. +Otherwise when the desired average bitrate is specified with the @option{b} +option, a bitrate-based mode is used. @itemize @minus @item @var{LA} - VBR with lookahead, when the @option{look_ahead} option is specified. @@ -3354,6 +3354,9 @@ than the average bitrate. @option{avbr_accuracy} and @option{avbr_convergence} are set to non-zero. This mode is available for H264 and HEVC on Windows. @end itemize + +@item +Otherwise the default ratecontrol method @var{CQP} is used. @end itemize Note that depending on your system, a different mode than the one you specified diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index c63b72e384..8c6414f8ca 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -597,6 +597,12 @@ static int select_rc_mode(AVCodecContext *avctx, QSVEncContext *q) else if (want_vcm) { rc_mode = MFX_RATECONTROL_VCM; rc_desc = "video conferencing mode (VCM)"; + + if (!avctx->bit_rate) { + av_log(avctx, AV_LOG_ERROR, "Using the %s ratecontrol method. Please " + "use the b option to set the desired bitrate.\n", rc_desc); + return AVERROR(EINVAL); + } } #endif else if (want_la) { @@ -606,32 +612,49 @@ static int select_rc_mode(AVCodecContext *avctx, QSVEncContext *q) if (avctx->global_quality > 0) { rc_mode = MFX_RATECONTROL_LA_ICQ; rc_desc = "intelligent constant quality with lookahead (LA_ICQ)"; + } else if (!avctx->bit_rate) { + av_log(avctx, AV_LOG_ERROR, "Using the %s ratecontrol method. Please " + "use the b option to set the desired bitrate.\n", rc_desc); + return AVERROR(EINVAL); } } else if (avctx->global_quality > 0 && !avctx->rc_max_rate) { rc_mode = MFX_RATECONTROL_ICQ; rc_desc = "intelligent constant quality (ICQ)"; } - else if (avctx->rc_max_rate == avctx->bit_rate) { - rc_mode = MFX_RATECONTROL_CBR; - rc_desc = "constant bitrate (CBR)"; - } + else if (avctx->bit_rate) { + if (avctx->rc_max_rate == avctx->bit_rate) { + rc_mode = MFX_RATECONTROL_CBR; + rc_desc = "constant bitrate (CBR)"; + } #if QSV_HAVE_AVBR - else if (!avctx->rc_max_rate && - (avctx->codec_id == AV_CODEC_ID_H264 || avctx->codec_id == AV_CODEC_ID_HEVC) && - q->avbr_accuracy && - q->avbr_convergence) { - rc_mode = MFX_RATECONTROL_AVBR; - rc_desc = "average variable bitrate (AVBR)"; - } + else if (!avctx->rc_max_rate && + (avctx->codec_id == AV_CODEC_ID_H264 || avctx->codec_id == AV_CODEC_ID_HEVC) && + q->avbr_accuracy && + q->avbr_convergence) { + rc_mode = MFX_RATECONTROL_AVBR; + rc_desc = "average variable bitrate (AVBR)"; + } #endif - else if (avctx->global_quality > 0) { - rc_mode = MFX_RATECONTROL_QVBR; - rc_desc = "constant quality with VBR algorithm (QVBR)"; - } - else { - rc_mode = MFX_RATECONTROL_VBR; - rc_desc = "variable bitrate (VBR)"; + else if (avctx->global_quality > 0) { + rc_mode = MFX_RATECONTROL_QVBR; + rc_desc = "constant quality with VBR algorithm (QVBR)"; + } else { + rc_mode = MFX_RATECONTROL_VBR; + rc_desc = "variable bitrate (VBR)"; + } + } else { + rc_mode = MFX_RATECONTROL_CQP; + rc_desc = "constant quantization parameter (CQP)"; + if (avctx->codec_id == AV_CODEC_ID_AV1) + avctx->global_quality = FF_QP2LAMBDA * 128; + else + avctx->global_quality = FF_QP2LAMBDA * 26; + av_log(avctx, AV_LOG_WARNING, "Using the constant quantization " + "parameter (CQP) by default. Please use the global_quality " + "option and other options for a quality-based mode or the b " + "option and other options for a bitrate-based mode if the " + "default is not the desired choice.\n"); } q->param.mfx.RateControlMethod = rc_mode; diff --git a/libavcodec/qsvenc_av1.c b/libavcodec/qsvenc_av1.c index c697845d7b..c298eeb61c 100644 --- a/libavcodec/qsvenc_av1.c +++ b/libavcodec/qsvenc_av1.c @@ -129,7 +129,7 @@ static const AVClass class = { }; static const FFCodecDefault qsv_enc_defaults[] = { - { "b", "1M" }, + { "b", "0" }, { "g", "-1" }, { "bf", "-1" }, { "refs", "0" }, diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 071a9a79e9..004ed8076a 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -178,7 +178,7 @@ static const AVClass class = { }; static const FFCodecDefault qsv_enc_defaults[] = { - { "b", "1M" }, + { "b", "0" }, { "refs", "0" }, { "g", "-1" }, { "bf", "-1" }, diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index c5b7ac7cc4..c94855e99a 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -374,7 +374,7 @@ static const AVClass class = { }; static const FFCodecDefault qsv_enc_defaults[] = { - { "b", "1M" }, + { "b", "0" }, { "refs", "0" }, { "g", "248" }, { "bf", "-1" }, diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c index 22f1ff7c0d..c2fb6fd8ff 100644 --- a/libavcodec/qsvenc_mpeg2.c +++ b/libavcodec/qsvenc_mpeg2.c @@ -82,7 +82,7 @@ static const AVClass class = { }; static const FFCodecDefault qsv_enc_defaults[] = { - { "b", "1M" }, + { "b", "0" }, { "refs", "0" }, // same as the x264 default { "g", "250" }, diff --git a/libavcodec/qsvenc_vp9.c b/libavcodec/qsvenc_vp9.c index d0340ef94b..8d26ec529c 100644 --- a/libavcodec/qsvenc_vp9.c +++ b/libavcodec/qsvenc_vp9.c @@ -93,7 +93,7 @@ static const AVClass class = { }; static const FFCodecDefault qsv_enc_defaults[] = { - { "b", "1M" }, + { "b", "0" }, { "refs", "0" }, { "g", "250" }, { "trellis", "-1" },