Re: [FFmpeg-devel] [PATCH v1] lavc/vaapi_encode: Add VAAPI version check for BLBRC
On Vr, 2024-03-29 at 09:10 +0800, fei.w.wang-at-intel@ffmpeg.org wrote:
> From: Fei Wang
>
> Fix build fail when VAAPI version less than 0.39.2.
>
> Signed-off-by: Fei Wang
> ---
> libavcodec/vaapi_encode.c | 20 +---
> 1 file changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
> index 940f0678a5..c4b5411e68 100644
> --- a/libavcodec/vaapi_encode.c
> +++ b/libavcodec/vaapi_encode.c
> @@ -1805,9 +1805,17 @@ 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)) {
> + if (ctx->blbrc) {
> +#if VA_CHECK_VERSION(0, 39, 2)
> + if (!(supported_va_rc_modes & VA_RC_MB)) {
> + ctx->blbrc = 0;
> + av_log(avctx, AV_LOG_WARNING, "Driver does not support
> BLBRC.\n");
> + }
> +#else
> ctx->blbrc = 0;
> - av_log(avctx, AV_LOG_WARNING, "Driver does not support
> BLBRC.\n");
> + av_log(avctx, AV_LOG_WARNING, "Please consider to update to VAAPI
> 0.39.2 "
> + "or above, which can support BLBRC.\n");
> +#endif
> }
>
> for (i = 0; i < FF_ARRAY_ELEMS(vaapi_encode_rc_modes); i++) {
> @@ -2032,7 +2040,11 @@ rc_mode_found:
> ctx->config_attributes[ctx->nb_config_attributes++] =
> (VAConfigAttrib) {
> .type = VAConfigAttribRateControl,
> +#if VA_CHECK_VERSION(0, 39, 2)
> .value = ctx->blbrc ? ctx->va_rc_mode | VA_RC_MB : ctx-
> >va_rc_mode,
> +#else
> + .value = ctx->va_rc_mode,
> +#endif
> };
> }
>
> @@ -2061,10 +2073,12 @@ 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,
> +#endif
> +#if VA_CHECK_VERSION(0, 39, 2)
> + .rc_flags.bits.mb_rate_control = ctx->blbrc ? 1 : 2,
> #endif
> };
> vaapi_encode_add_global_param(avctx,
LGTM, will apply,
- Haihao
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH v1] lavc/vaapi_encode: Add VAAPI version check for BLBRC
From: Fei Wang
Fix build fail when VAAPI version less than 0.39.2.
Signed-off-by: Fei Wang
---
libavcodec/vaapi_encode.c | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index 940f0678a5..c4b5411e68 100644
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -1805,9 +1805,17 @@ 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)) {
+if (ctx->blbrc) {
+#if VA_CHECK_VERSION(0, 39, 2)
+if (!(supported_va_rc_modes & VA_RC_MB)) {
+ctx->blbrc = 0;
+av_log(avctx, AV_LOG_WARNING, "Driver does not support
BLBRC.\n");
+}
+#else
ctx->blbrc = 0;
-av_log(avctx, AV_LOG_WARNING, "Driver does not support BLBRC.\n");
+av_log(avctx, AV_LOG_WARNING, "Please consider to update to VAAPI
0.39.2 "
+ "or above, which can support BLBRC.\n");
+#endif
}
for (i = 0; i < FF_ARRAY_ELEMS(vaapi_encode_rc_modes); i++) {
@@ -2032,7 +2040,11 @@ rc_mode_found:
ctx->config_attributes[ctx->nb_config_attributes++] =
(VAConfigAttrib) {
.type = VAConfigAttribRateControl,
+#if VA_CHECK_VERSION(0, 39, 2)
.value = ctx->blbrc ? ctx->va_rc_mode | VA_RC_MB : ctx->va_rc_mode,
+#else
+.value = ctx->va_rc_mode,
+#endif
};
}
@@ -2061,10 +2073,12 @@ 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,
+#endif
+#if VA_CHECK_VERSION(0, 39, 2)
+.rc_flags.bits.mb_rate_control = ctx->blbrc ? 1 : 2,
#endif
};
vaapi_encode_add_global_param(avctx,
--
2.25.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH v1] lavc/vaapi_encode: Add VAAPI version check for BLBRC
From: Fei Wang
Fix build fail when VAAPI version less than 0.39.2.
Signed-off-by: Fei Wang
---
libavcodec/vaapi_encode.c | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index 940f0678a5..c4b5411e68 100644
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -1805,9 +1805,17 @@ 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)) {
+if (ctx->blbrc) {
+#if VA_CHECK_VERSION(0, 39, 2)
+if (!(supported_va_rc_modes & VA_RC_MB)) {
+ctx->blbrc = 0;
+av_log(avctx, AV_LOG_WARNING, "Driver does not support
BLBRC.\n");
+}
+#else
ctx->blbrc = 0;
-av_log(avctx, AV_LOG_WARNING, "Driver does not support BLBRC.\n");
+av_log(avctx, AV_LOG_WARNING, "Please consider to update to VAAPI
0.39.2 "
+ "or above, which can support BLBRC.\n");
+#endif
}
for (i = 0; i < FF_ARRAY_ELEMS(vaapi_encode_rc_modes); i++) {
@@ -2032,7 +2040,11 @@ rc_mode_found:
ctx->config_attributes[ctx->nb_config_attributes++] =
(VAConfigAttrib) {
.type = VAConfigAttribRateControl,
+#if VA_CHECK_VERSION(0, 39, 2)
.value = ctx->blbrc ? ctx->va_rc_mode | VA_RC_MB : ctx->va_rc_mode,
+#else
+.value = ctx->va_rc_mode,
+#endif
};
}
@@ -2061,10 +2073,12 @@ 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,
+#endif
+#if VA_CHECK_VERSION(0, 39, 2)
+.rc_flags.bits.mb_rate_control = ctx->blbrc ? 1 : 2,
#endif
};
vaapi_encode_add_global_param(avctx,
--
2.25.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
