From patchwork Fri Feb 23 07:14:42 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: 46453 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp797128pze; Thu, 22 Feb 2024 23:13:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXoCtBYbHji4ri8LVWLZTvRlQ+jgzYJDbhhnPNK7fYGLd0G2iUh+MOJsJdyiDPOADOILk8yKvmfPbVDHvyIqev57rE6xrqquqoCjA== X-Google-Smtp-Source: AGHT+IHCgb+LvLzxj84/jx9ZgavxQZlmVI7wyQIuQ6IMVkD9HFp8jEI3/kH+Mk/C3B9DZ1P3Ye7j X-Received: by 2002:a17:906:ce4b:b0:a3f:161e:98e with SMTP id se11-20020a170906ce4b00b00a3f161e098emr575567ejb.50.1708672408125; Thu, 22 Feb 2024 23:13:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708672408; cv=none; d=google.com; s=arc-20160816; b=T795SgYoEkQHnELK4wdudPuXtSNekomtIxG9BipNaAgErHm8gzDtOFqYJqQEFBdMRm +AmIqjVm1FyYKc/KRSiH1BMIRWqmY2s/yrERuDLO0zY0NJ00zH1tl2rPRs0CaYo+dRyz jt0rR136bj09iwgP59owmmRx3SyAaxES5tGixJUXESkwMkdDB6XRd8NU0LSO8rxAzwVy Ev44KBOzX3jgqn3jm9+MCPb0yKrOC2dbUK3vCBM71R7HY9Jmcg6OEo42yMNcfT7y9Gn8 GYn4dMHN5cfKn3vGFXj4cxo06Qso66DC/QBuCPiPipytvuBQ9xe22Zsha2fJ0BtJ+Rdl 0X4A== 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=BqS7UjwPlfhMDfb3OCsgl4iwh/HerlkH9uw5F1P3XcE=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=L4vX22TIAhTnapuYTvgwWL+iBxtanZaYQgcvfYSrn3oTPV0QzJGrxSrTK6Ydxw/8h+ 2s0b0O8iBKN8DJfL4eDUO/R/vxs6ExPIgkjET+6TceqEGnOg9thLewD4ggpfBx1bi0eP LyKSNH9K+A7+9Gm/jOcH829SgvGQWVm6V3b3dBIrTCboAXJjdnbxDdxQPuJsA7jTZvWP FD+GMeCpvc3nvyfVZmXQw2lRMHpWUGTC9BiaysMPyDFY7G02A8Wy9sDeqlYjaxQkc6H8 iRhuF6MGhEfsF2Js0aEhDgfp8ZpoZiekLGH4AeRqQ6w6cjUJfZAOGBa0b8lpfqNKptto ChdQ==; 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=GmgYQPAs; 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 u23-20020a170906069700b00a3f0ec6e162si2798630ejb.462.2024.02.22.23.13.27; Thu, 22 Feb 2024 23:13:28 -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=GmgYQPAs; 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 E8B1E68C5E2; Fri, 23 Feb 2024 09:13:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E996D680BE7 for ; Fri, 23 Feb 2024 09:13:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708672403; x=1740208403; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=PXjrc0HkoPsPU2TBvlvjEuufPLhwkkOaz/SQ7oESm1Q=; b=GmgYQPAs+HA8tcjLv2xXKjiA/X+bVW/04Bvn7DYmh/NcXGixH8fQxqgG /2y/OvAziW6EdmPV1WqXPTzkLkuguYlwI2KQEL/1IjDx93JH1bhF/t3FT vOgu9nWShdzYVoO+XC3XVjF6+1EZePKiJ8onKKUrecN0Ge8FCi8xYMOkZ Auf/pxliD64lThk1Dk/NS60QAjjgAaxj1roHWhBXLkHpSUEGw05Hwy57k hgtXcU3vWCZ9i3nzwtQEl/JvORYToOC1dWkEkcYE8Lsi4I2bUnLKcCtJn dDOGxn9fovZ1RhkU5XA069PR6kRakE5ossRfBgTz6gmEVKJCzayN2ptu5 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10992"; a="20510852" X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="20510852" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Feb 2024 23:13:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="36603323" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by orviesa002.jf.intel.com with ESMTP; 22 Feb 2024 23:13:14 -0800 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 15:14:42 +0800 Message-Id: <20240223071442.170041-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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: zzOgzeB/C4Zx From: Fei Wang Signed-off-by: Fei Wang --- update: Print mbbrc status with "ON/OFF" instead of "0/1". 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 9f477d7c53..3f11a80039 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -4086,6 +4086,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..e4bf15fea0 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: %s.\n", ctx->mbbrc ? "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->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 6964055b93..9774cc86b1 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 */