From patchwork Wed Feb 7 00:40:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 46088 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a38a:b0:19e:8a94:b663 with SMTP id w10csp216051pzk; Tue, 6 Feb 2024 16:39:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IHfWBcG3jrKfVS7iAqmApuzIpzQ0oNd4M60oNtOkGauzdtvG8pfYn5MmARpJJlfaGtUZWhq X-Received: by 2002:ac2:42c5:0:b0:511:531f:1d9 with SMTP id n5-20020ac242c5000000b00511531f01d9mr2679046lfl.21.1707266383203; Tue, 06 Feb 2024 16:39:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707266383; cv=none; d=google.com; s=arc-20160816; b=cpnYdrjHCLaEGc3ZWVB34r4acxZDh+yjjjDr+U4RdmnTME4UUOWmS67f3b6kCkF2S7 dMrVSF5IDzadVO/xpVuoIqh0zL1gT8Ubkv8byYwVrob9fqFBlDNnm25C20OrtqKdG8zA VqBg5DmePOlPA7sCzwAyEH7RFaUV+Au0Bhouyq5pxS6UoAfCRx1mLvaT9JQm+cB1is6R MBLVxPmd/QQBLeSeywTtWC7wDPFT2ZcilmaKVgHU3NBnmiT+fZe7ibradcg31gexcbcu XLUGTZRTtUEY1UVJSouzUAdxpN726xrV27zz8/MR1jG6o3cZeKA01jqxsAXMpZMqE3zt yVCg== 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=wy/rJerhL1lCELVhH1f3y4L/s/RHYPoml6bzpom8oVQ=; fh=iXnXT6YHQWKAZcV2Aw5SYMIQtFfB3GMFijlkUBrAltA=; b=pTy9t6kCgngYFfrUrbTyZbBFYvXEA+hsKIpPQQTlYJLFgA7MdUNW33Y3bT30sQkZKS IKtElpenA14yYpol0v+q8ehU9yO6LFKc6lG69hX2vU0hzZ6McaTByvi+jySGxTpKt5NM xK1qwWlXbjOOxd8nj29ffzUlcreYWXkHbfyx0kxDNdHBy20LsTZMGIcgbG9wy0NxZQ3S hoLHSHAE/p7fKK3uw6XnbN6j8ZXOdDgRnMmUahck+u4FZ7J4HWOG5EGAJvC7DfIk77yU n571VwuXeEUyeWlmNJBl78bLxDFPk/KmaQA6gUaqemskydLLNY5PDG8bxWoHyK5qHWGM V5jQ==; 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=bzMMUgiu; 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; AJvYcCXUCSv/X9D9y6gqlG2/0OxCHzyxCdT/8hRZ3eBWZqoUZnxIKYtp3smYA+9Q3roQiF7gq6t1dflGVR338SgZ6tKWks62PnMUyQcKin3faSUf8EfyWLy/eXShoyf/Paf22no3CtDqGDJCt0GT4apN3nGmRB+cMTyKfutqq6mt5nWF8O/a0Q1Lzl7O9qpdpYbCXMAooU8sufKkUCJgtwoO6ZqpuZZXv5bwpCKBKHDvPOwdFqUPN+9RrCSQjixhYyd3qBMCSTHAx+41FT2fX/vnV1y5iUq+A0kxQWl0GWaTV9uZc8zgLNIg9ZMfSMrweV+Ts0Ag9lT3PuasjOdgn62GUTvwhDmMjZIwalLK3X3Eou++YIhqwqISUv5U6SR2xKpGgvYIdAoarTnyUI0uiAUIjEKMyBWf+VhpA1RBbCy7dbq6zWWWih3BiUgNK+kwMfOyZ35FGxX4k3F+E3p4TB/wVUMXeh0gjjRl1uQ+7EhHsLk7x2bWYtrzXGNU/4i1yJ9yG4rITJP7m4uMji8h+c4lvlBMOCrU28sIYMFsUElTkqKAGb0DS4+wp5nkflUEsJa0z0bPOq3OgcqYE/VKw0blF3szyUNn+dyrFq5nwvGCDzW9GEhklKCE8m1q+9Dqd+pCfZE3zDBlHcmjnXblSXU+q9VLyXKViPwHauMDa+S031QSpjd8LTWBTPK3V/kA14dOQrf96QEq4nIYTnnCSjZUrDwNidnwE9wNVJ1DHuXN3RVBgOUx+aBB+q7Gf5fPojTUz+B2bGaKtFlQCBOazkoD69esMgXo7iCbY1iVmDu8MCXVBqR46gzMkfmEzlJif5k8QT88TBwCIFoTGT0S+DhYCYLWr7HoGXHUq4SgPHFiSBnoSa0fraiVcz9Exw2K2qFPiwDfwQ2b7dJtu7e6Xl/AB/IRYZeRodc1i8VyyTKAxRSg4G09FApVQbKaTRQtGzPoBmXsaT ndid55Km+32aaiia78aD/+vSczNkvK/s0puzNvAebBJH5B6stnAno+vRDgjFd7G0xCqYAeZ7/335GZB2eYKeoSifeNHedF6V+hU8KD0gv3HHrBS4dfQApU1ueTOC5r4MRC4Bl1yABipxj2mtBkpke4jxYEYsueGUQk/4CFCf4wGFCnp2VXUzQ+e08qOna/ztS1gK64OWU8tCfYm5/qabDqbhy5xab8da3JFL2PhEzc/bH06EIldexpG3LYyegvBycrk1jPpPAAk/K37kZ1N9V+elU+h470QFNNi1ZS2re7XVXaUbaAZ9Yz55+ajBdZ4sYo7TPu2ozwd/IJR8oiDY9L8ni7h0Pa3inIvf0zqzU24TMtFSd41T9uf3bFXNn4h6F/0iqKQtma1TJIE4Jk0FRGSyHemc3zxj6DSm/NUVR58Lt3wWpUrvd9VfB12Wo3ykVN/EtlEJdYmmO1TPrNfVED9OudJGiMuNiP/cHCOimFKHvs1EhGPOXLfIAru8uRF2Va9suoZ+qTggoZsFb5uRJLvz6Cj9tmVQG7r4pgeKpDebxyCnw2I+diSYrTep7iFcCsA1/WSXVdJxRy2GU+ijpEiAi6EZWFNzDYs3EiFPb0Ne0Cd6ibI/1jt/EsFEXF26ZW Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u8-20020a1709063b8800b00a37a609d4desi136330ejf.1014.2024.02.06.16.39.42; Tue, 06 Feb 2024 16:39:43 -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=bzMMUgiu; 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 9727F68D0D4; Wed, 7 Feb 2024 02:39:39 +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.9]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E83E768C905 for ; Wed, 7 Feb 2024 02:39:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707266377; x=1738802377; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=59d763QJMTk4EwbmQSJKpH9XJE2JAKmT0EthwrkCqT4=; b=bzMMUgiupeuLqMczpT/4rdnonfmdrasjaPNU+wgyBjlI/61+O/QBBVgG nkkY4igAcBYdfeHeHp8oxlWNTVlMJ9KsKgZBE8SLJJK2GMIXUyQa59rq4 tz3gh4/mbnoF+uVcVwhu/OxkqIHse7iYRLaNYFqvUW3YoEuVMeCZtxc8h fKyH8KCtFi6pS67KVnFuyR5Y2y/2poC52z5Hi/ggmA34/9T4p8OwnPsGZ 8hLTOb5hYpoxVJE9CQCmJACxgJbZAk4SDB+iexn1a5xxwPbu6BZLKLm+M qnHHuoi3U6GbdV1beHDiY1GTauPJog/OG0yg5IyTrL1NpG6HFqe8fiRW2 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10976"; a="23357269" X-IronPort-AV: E=Sophos;i="6.05,248,1701158400"; d="scan'208";a="23357269" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 16:39:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,248,1701158400"; d="scan'208";a="5948372" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by orviesa004.jf.intel.com with ESMTP; 06 Feb 2024 16:39:28 -0800 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Feb 2024 08:40:45 +0800 Message-Id: <20240207004045.3242406-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] lavc/vaapi_encode: Enable Macroblock based bitrate control 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: fei.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: opWCKIufCuaB From: Fei Wang Signed-off-by: Fei Wang --- doc/encoders.texi | 3 +++ libavcodec/vaapi_encode.c | 11 ++++++++++- libavcodec/vaapi_encode.h | 9 ++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index c9fe6d6143..b66d5da31f 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -4080,6 +4080,9 @@ Quality-defined variable-bitrate. Average variable bitrate. @end table +@item mbbrc +Enable Macroblock based rate control. Invalid for CQP mode. + @end table Each encoder also has its own specific options: diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 86f4110cd2..83eb881428 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1806,6 +1806,9 @@ static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx) int i, first = 1, res; supported_va_rc_modes = rc_attr.value; + if (ctx->mbbrc && !(supported_va_rc_modes & VA_RC_MB)) + ctx->mbbrc = 0; + for (i = 0; i < FF_ARRAY_ELEMS(vaapi_encode_rc_modes); i++) { rc_mode = &vaapi_encode_rc_modes[i]; if (supported_va_rc_modes & rc_mode->va_mode) { @@ -2017,13 +2020,18 @@ rc_mode_found: ctx->va_bit_rate = rc_bits_per_second; av_log(avctx, AV_LOG_VERBOSE, "RC mode: %s.\n", rc_mode->name); + + if (ctx->mbbrc && ctx->va_rc_mode == VA_RC_CQP) + ctx->mbbrc = 0; + av_log(avctx, AV_LOG_VERBOSE, "MB bitrate control: %d.\n", ctx->mbbrc); + if (rc_attr.value == VA_ATTRIB_NOT_SUPPORTED) { // This driver does not want the RC mode attribute to be set. } else { ctx->config_attributes[ctx->nb_config_attributes++] = (VAConfigAttrib) { .type = VAConfigAttribRateControl, - .value = ctx->va_rc_mode, + .value = ctx->mbbrc ? ctx->va_rc_mode | VA_RC_MB : ctx->va_rc_mode, }; } @@ -2052,6 +2060,7 @@ rc_mode_found: #if VA_CHECK_VERSION(1, 1, 0) .ICQ_quality_factor = av_clip(rc_quality, 1, 51), .max_qp = (avctx->qmax > 0 ? avctx->qmax : 0), + .rc_flags.bits.mb_rate_control = ctx->mbbrc ? 1 : 2, #endif #if VA_CHECK_VERSION(1, 3, 0) .quality_factor = rc_quality, diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index d5d6d5eb1b..f2abfed459 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -216,6 +216,9 @@ typedef struct VAAPIEncodeContext { // available modes). int explicit_rc_mode; + // Macroblock based rate control. + int mbbrc; + // Explicitly-set QP, for use with the "qp" options. // (Forces CQP mode when set, overriding everything else.) int explicit_qp; @@ -538,7 +541,11 @@ int ff_vaapi_encode_close(AVCodecContext *avctx); VAAPI_ENCODE_RC_MODE(VBR, "Variable-bitrate"), \ VAAPI_ENCODE_RC_MODE(ICQ, "Intelligent constant-quality"), \ VAAPI_ENCODE_RC_MODE(QVBR, "Quality-defined variable-bitrate"), \ - VAAPI_ENCODE_RC_MODE(AVBR, "Average variable-bitrate") + VAAPI_ENCODE_RC_MODE(AVBR, "Average variable-bitrate"), \ + { "mbbrc", \ + "Macroblock based bitrate control",\ + OFFSET(common.mbbrc), AV_OPT_TYPE_BOOL, \ + { .i64 = 0 }, 0, 1, FLAGS } #endif /* AVCODEC_VAAPI_ENCODE_H */