summaryrefslogtreecommitdiff
path: root/libavcodec/vaapi_encode.c
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2017-04-30 19:27:54 +0100
committerMark Thompson <sw@jkqxz.net>2017-08-20 12:56:24 +0100
commit9c878651dbc8c795894740af74670b591551f619 (patch)
treec0628af9daccaf2fcac85ba233f618eb78b8fc2a /libavcodec/vaapi_encode.c
parente7053f3316f53fc31d25384e3b6c89c96f8a5b20 (diff)
vaapi_encode: Move quality option to common code
Use AVCodecContext.compression_level rather than a private option, replacing the H.264-specific quality option (which stays only for compatibility). This now works with the H.265 encoder in the i965 driver, as well as the existing cases with the H.264 encoder. (cherry picked from commit 19388a7200e5d99c703271f05dba1c806720e808)
Diffstat (limited to 'libavcodec/vaapi_encode.c')
-rw-r--r--libavcodec/vaapi_encode.c35
1 files changed, 35 insertions, 0 deletions
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index 2de5f76cab..22114bedbe 100644
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -1429,6 +1429,41 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx)
goto fail;
}
+ if (avctx->compression_level >= 0) {
+#if VA_CHECK_VERSION(0, 36, 0)
+ VAConfigAttrib attr = { VAConfigAttribEncQualityRange };
+
+ vas = vaGetConfigAttributes(ctx->hwctx->display,
+ ctx->va_profile,
+ ctx->va_entrypoint,
+ &attr, 1);
+ if (vas != VA_STATUS_SUCCESS) {
+ av_log(avctx, AV_LOG_WARNING, "Failed to query quality "
+ "attribute: will use default compression level.\n");
+ } else {
+ if (avctx->compression_level > attr.value) {
+ av_log(avctx, AV_LOG_WARNING, "Invalid compression "
+ "level: valid range is 0-%d, using %d.\n",
+ attr.value, attr.value);
+ avctx->compression_level = attr.value;
+ }
+
+ ctx->quality_params.misc.type =
+ VAEncMiscParameterTypeQualityLevel;
+ ctx->quality_params.quality.quality_level =
+ avctx->compression_level;
+
+ ctx->global_params[ctx->nb_global_params] =
+ &ctx->quality_params.misc;
+ ctx->global_params_size[ctx->nb_global_params++] =
+ sizeof(ctx->quality_params);
+ }
+#else
+ av_log(avctx, AV_LOG_WARNING, "The encode compression level "
+ "option is not supported with this VAAPI version.\n");
+#endif
+ }
+
ctx->input_order = 0;
ctx->output_delay = avctx->max_b_frames;
ctx->decode_delay = 1;