From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7F31B48DA1 for ; Sun, 25 Feb 2024 19:15:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E9D1A68C719; Sun, 25 Feb 2024 21:15:32 +0200 (EET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25BD368C15F for ; Sun, 25 Feb 2024 21:15:26 +0200 (EET) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-412a5de8a06so37025e9.2 for ; Sun, 25 Feb 2024 11:15:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1708888525; x=1709493325; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=vLnD4Yx5G3/7nGAPDw7We5SrFJr0zdDyv8BiID8KDc8=; b=UuUFUsLz/DILc8FhxYUngGfo/9vOqGPkpndEmMLKmLwMH3ZVGiM2NqvLyXletZZTfN vDiuMafgLf91LhhdUKSDfFLKtc3P39dqPhHFTNnglRhRAEWfa/rSv4yUqchbrcs9q0WG g5MovHMKlHWXGtoZIoCvfsJQQNo4jIfhDMOQbzolaifiav5lvgFfDjFw7KV3IBF8TENO HVH0KC4fhNFZqiFLDVzBWavZpPDuWD8cXmhcSVCz7hPYeYXWp1xB6FpC0xj3fmW8LDDT LqfwKN3ckTyZpU6px/Zdbqy+qODq4JnpmdOspHG6gxDKfgVXNrqS/Iunm5yxE+jh6RrI mi3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708888525; x=1709493325; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vLnD4Yx5G3/7nGAPDw7We5SrFJr0zdDyv8BiID8KDc8=; b=Xvi/bMWeY7Y/p9Z8xxxuMJ5WjfsRZF8XLXx7DeYBPeS+dBGq+3nx1sOPzu9llXvG+o ZXTQbu30cqowtftBGUVEsug3O438m0fv6e7bM1/KS3znjqifxQtqj6KbwctvkrROaPqo egdfSNPogAGB9p3HypbPpMDz9gkc55HpEby650FT20AbZjHBvI690PmxGMgTvsyaxGHS nVmrcJHciWZit7G4i9esGEx6jgG8fXv+Y0XAphiFVwjyRKSD4iRJWLXsNZT1vcqNDpZ1 Et9uWCeuFFU35D7s2jobdHuP9m3o1kyAj5LFxMiO3fPsJL61KPC55W5xFEVB98HU+XY9 +OJg== X-Gm-Message-State: AOJu0YwnyKD/Nv9SnETNKravfO4jFIonBPCm9CL2UXPav08M3yLP8kld V2yWWfJm6wtxFzaMmj8sOQNaNxeCXFLmKqWEvkTHmciqj1epzVLShVMMjgcPidIHynpbAFHUE0X h X-Google-Smtp-Source: AGHT+IHz/4HE1wbxZiSNmAriWmdO05iM5ZZSJp4HWo5vajtaSIir+QEreKeWORblAoRGubyQYcMrgg== X-Received: by 2002:a05:600c:138b:b0:412:37f4:4a3b with SMTP id u11-20020a05600c138b00b0041237f44a3bmr3643491wmf.34.1708888525301; Sun, 25 Feb 2024 11:15:25 -0800 (PST) Received: from [192.168.0.15] (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id d3-20020adffbc3000000b0033dd2c3131fsm2074229wrs.65.2024.02.25.11.15.24 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 25 Feb 2024 11:15:24 -0800 (PST) Message-ID: Date: Sun, 25 Feb 2024 19:15:53 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240223071442.170041-1-fei.w.wang@intel.com> From: Mark Thompson In-Reply-To: <20240223071442.170041-1-fei.w.wang@intel.com> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 23/02/2024 07:14, fei.w.wang-at-intel.com@ffmpeg.org wrote: > 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(-) Can you explain what the option actually does? The current documentation doesn't really give any hint of whether a user would want it on or off. It also seems like this is a legacy name and maybe should have a more generic name to make sense - the iHD driver at least accepts the option for H.265 and VP9, neither of which have macroblocks. > 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; Probably not a good idea to silently disable what the user explicitly requested. > + > 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, What did the previous 0 "use default" do here? > #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 */ Thanks, - Mark _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".