From patchwork Fri Mar 8 08:45:29 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: 46897 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp804854pzb; Fri, 8 Mar 2024 00:45:31 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW10smmhPZMr7+GkSGZOZNH9fucAbsoE1s7R+BSNEN5cTshMaay4l5TBE4GA823GDdRlEjB9uXia/ijP/8PZ6kViyqgSMlALJ0o3g== X-Google-Smtp-Source: AGHT+IHsvz7fXKn/MslRkNa0tKXMB4OIbTovpysFzcYMrGu0xesaafVc/m5/AbvHQ+P6hmdRIAjz X-Received: by 2002:a17:906:d8c:b0:a43:afff:ca13 with SMTP id m12-20020a1709060d8c00b00a43afffca13mr14306385eji.57.1709887531214; Fri, 08 Mar 2024 00:45:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709887531; cv=none; d=google.com; s=arc-20160816; b=foVSner/VeOTDcTvu/thAItG7zAT8XMHAlUiedFrzfVa1NJy57IbEthwcqPeelLBp3 NbRGpqunoGL9VzMDawPxaNTAJsv04dn6u1Te/8tqNXQllFg+ZOYjN3zUrJHYR5KqpIvB zuhoFemDAnF42pu9bbA1dQvZU7pTBeSVrVPcMJz/C5p53weKAbPYuQfOkyMb28rSQnYk 021PjxJLvEbQx9vMvjb8TUWaB/tUVhmfZKuh+Wcwk0cdWHQ0I8eqVxlnOA+HmUmDUIyE EjVCfuA1YPpNOAYsUinUFu+uostuG0e5Qo5RWIS3AQ+BC/BS9HnXlnznHRz9qrWlsVea cknA== 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=VF51PD6mDopp2dyavBq7zuInSUap7E1Z8TIm9H8VXBE=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=m7KkTPfB7o4hj0KSSwWZ5RhQBaRAFuB0EcEyCRwapQg2wAMBxM2HjXLuR82xp/raRT 8oPwsrz5cTU3K+2ZN/PuvNvCrPeYre6Fe8e/CBiO23Kxufcf/3yO3xDsh1ajAD1CqeFQ cX27LYM+Kjiphrjv22ni7CmqJ+qqgYHTPcpre3LJ45qlBN+jjzOjFU8mq9FHKcimAtvk 3gW5Mq2NHwEiv9SD2DdlOZPlRPXDi1iLecx2q3/cDnLC8gMBUfokqi9Zppe+Uh+JoDXp imyY4+u4E7WvqonAjaT9BRiYgpIPXYWitXdySOFKRwr+VCJtoh9UxDX0A8bwsF0qKjif KdTg==; 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=Xq349IkG; 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 gt34-20020a1709072da200b00a45b6e84df8si2450460ejc.2.2024.03.08.00.45.30; Fri, 08 Mar 2024 00:45:31 -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=Xq349IkG; 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 B8DFE68CBED; Fri, 8 Mar 2024 10:45:27 +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.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAF5F68C4C4 for ; Fri, 8 Mar 2024 10:45:20 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709887526; x=1741423526; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=1mKTGA2htQe8M/kaB8rXv1T//BoY07sSoHcjXcLIHXI=; b=Xq349IkG7NwHUWlz7RN1TsRitHEwcOhk2BmKa7P5kRZ2AosD59XmlWuQ BmhBtIikBRt03/XgZH+/PieeGSylZUU0VYdnge8jCLstLGkyQ01Y0Ifjt Qhq8z/m1ZpmQ7vHdBo9V7luUInKt3qFuEglytYYt5bgPl3bZ5uwxdgs7o 2nAWdBR9bNHBmd6hX/WRuY5HUCJQP5d787/ICFlSFTYrqMTh9NanvvlqF IYNAxZ7E7atQ0MH2dcRmtT1FgZ9MkTsPE2zzoxBarZmEnkje+683TCxMT 6mqCU+DUp7oaminzgJM9F1/GhqrxZmXEF4jG2SgbzNCxark2Ik0oz8M4V A==; X-IronPort-AV: E=McAfee;i="6600,9927,11006"; a="15166122" X-IronPort-AV: E=Sophos;i="6.07,109,1708416000"; d="scan'208";a="15166122" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2024 00:45:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,109,1708416000"; d="scan'208";a="14887074" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by fmviesa005.fm.intel.com with ESMTP; 08 Mar 2024 00:45:17 -0800 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2024 16:45:29 +0800 Message-Id: <20240308084529.70683-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] lavc/vaapi_encode: Enable block level 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: bz2K9berf4Gu From: Fei Wang Signed-off-by: Fei Wang --- doc/encoders.texi | 4 ++++ libavcodec/vaapi_encode.c | 13 ++++++++++++- libavcodec/vaapi_encode.h | 9 ++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 5f7864770e..7c223ed74c 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -4089,6 +4089,10 @@ Quality-defined variable-bitrate. Average variable bitrate. @end table +@item blbrc +Enable block level rate control, which assigns different bitrate block by block. +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 808b79c0c7..940f0678a5 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1805,6 +1805,11 @@ 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->blbrc && !(supported_va_rc_modes & VA_RC_MB)) { + ctx->blbrc = 0; + av_log(avctx, AV_LOG_WARNING, "Driver does not support BLBRC.\n"); + } + 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) { @@ -2016,13 +2021,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->blbrc && ctx->va_rc_mode == VA_RC_CQP) + ctx->blbrc = 0; + av_log(avctx, AV_LOG_VERBOSE, "Block Level bitrate control: %s.\n", ctx->blbrc ? "ON" : "OFF"); + 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->blbrc ? ctx->va_rc_mode | VA_RC_MB : ctx->va_rc_mode, }; } @@ -2051,6 +2061,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->blbrc ? 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 6964055b93..0eed9691ca 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -216,6 +216,9 @@ typedef struct VAAPIEncodeContext { // available modes). int explicit_rc_mode; + // Block Level based bitrate control. + int blbrc; + // 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"), \ + { "blbrc", \ + "Block level based bitrate control",\ + OFFSET(common.blbrc), AV_OPT_TYPE_BOOL, \ + { .i64 = 0 }, 0, 1, FLAGS } #endif /* AVCODEC_VAAPI_ENCODE_H */