From patchwork Thu Jun 7 23:43:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9293 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp193457jad; Thu, 7 Jun 2018 16:45:33 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKvefUfie75IwPM/xM2ZsjkJFbkgqthXONYYl4q8iEb7dCSpw1zETJCkRd+0FjaIuIb0Fq+ X-Received: by 2002:a1c:9788:: with SMTP id z130-v6mr3061584wmd.88.1528415133565; Thu, 07 Jun 2018 16:45:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415133; cv=none; d=google.com; s=arc-20160816; b=nuTLT/4D9C/E0dBRj/15DgshvpRZ6DXo2BVbYBDcDVBKnZhPtaNBeylu8WV2yv6+tu cdMh1dfrW7Dp2siA07k/jmDVRLRrGLCLQ1vXl+nqM8U0Uw5LB5wJRitHsTehru8Ghxz0 C+sef+OsGEy45vecdI9vtvNc4Zn+/dov0WPZx/Emg3Ea/VtOqkGwHYCTqQ60IyTyNUOe F7zlYtQ1gkE3fCEhAUGi9kdosbcpL/wNUKfnjO5eokQOq4F5vg2pQKqdyjaOVkCxHjy9 VO7n7RoWrz9F6uYyjPhrXuT7X2cQCd67IX3Thw9RYcYUjdoturozp8CIEDCCmn+ryb8U R60Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Ceg34rryuL/73xINfj5dUpefUt6FufNZUgq6uUnprUk=; b=G/h1eHZmxthF9KF/0j2GNGsXwL4oxA6M5mNL0udADhRNKJ9rPXraQob5S9pPUb8PTn MPZZ0DTgAClFQ5CfCbFqUnQWEEDw5/Bm/YcBiE4RhtfFIBxh212XbTbf/wCnnPgATD6/ UdQrgpJJqq0UvoyzLVe9i7ZJx7vn3maDPaztaZKjZVSk/Xcl0FIn6cbGY1CbGlMkw/bE 49bqdDJjQjF/9AVTGNxIFvEcoBRo931vML3h/k12ezKLTSYZ/bwJpzBZDrWbclxQwSoZ hjPrd6cygPzb0szumGe/NOq8jwAQ7VvTJvLS43dExvxglE2Og0f3PA7xYkptLQ7LUeIx 38yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=tFh5xxQl; 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 6-v6si7966205wre.291.2018.06.07.16.45.33; Thu, 07 Jun 2018 16:45:33 -0700 (PDT) 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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=tFh5xxQl; 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 CD70268A7D5; Fri, 8 Jun 2018 02:43:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f178.google.com (mail-wr0-f178.google.com [209.85.128.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A146F68A750 for ; Fri, 8 Jun 2018 02:43:06 +0300 (EEST) Received: by mail-wr0-f178.google.com with SMTP id w10-v6so11515321wrk.9 for ; Thu, 07 Jun 2018 16:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=cBjjeK3HUUrf/kiH2ICptvG0etr7jyKLi5Unjjwc7wY=; b=tFh5xxQlt360ThCFA4ynpeUxbvDZn7YpznuruefpvhbVQZEv/lgZDDj6OW8qKU81VB jnzDQUmGrmLhOGFOhsAELwdgW2lvUWtEiZEAU1SHte8ZDBSVkNfxpxVx5LWq83X8Hoiz toQ3CR8XCA/Qpt6XhHUB63cPGzW/iVGI8OHH7vxd6hcEizKJAR1eA7sghPbQEOay5iaX IMBwsspy0zGgjzc3CC620mMX2kNKHl9KugD9ijEgEgtMfKQIYYxWNbkp1v1mM28b8mRl iLKRQqvoAYQvbWEcskRQpOnBEQnxCWZW+gncSE/2XWytbVBBt5hriRT1StrwvRNtEu81 ltqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=cBjjeK3HUUrf/kiH2ICptvG0etr7jyKLi5Unjjwc7wY=; b=V+EtolqCmUeC4nmzQyZus9aySF+9yXSvRaTIswjvvw6MrZLluiLPzRmnyFot3q3A5k erV682ZB+YYgfi6RdO6jF646h14g51q3F6r0QRSBopOj1RDju5yS4+wWf3XF45EGe5xu +/efxTnGxX7oYdEJiShKDSrQ0G7oCN/KthJ0AtaD1YheZMu3pbNaSKW1rjr6GzvkChdj xwQ3UtWmPUKm4edZSEVzPX0/0JQqasL1rJwSvubkRyuxfE1xQLGlraAGiyhFHNwTCX9M gqMC0XAYlKrgVyvMnsFkb3Q7Fzkz2rjqd6vZTTkDECLtwO+fIgTuyuSpH5qQVD6+tSE3 YEpg== X-Gm-Message-State: APt69E1OVEgqid0qOePynbu/eUu4vjHWtk7AKjeEDfWciJ0x+N3iuM+S HsPEI3iWUNfxLuYy3tv4mqdZBQhT X-Received: by 2002:adf:ee0e:: with SMTP id y14-v6mr3392908wrn.63.1528415033757; Thu, 07 Jun 2018 16:43:53 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id r2-v6sm18640545wrq.55.2018.06.07.16.43.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:43:53 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:09 +0100 Message-Id: <20180607234331.32139-15-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180607234331.32139-1-sw@jkqxz.net> References: <20180607234331.32139-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 14/36] vaapi_encode: Clean up the encode quality configuration X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/vaapi_encode.c | 84 +++++++++++++++++++++++++----------------- libavcodec/vaapi_encode_h264.c | 7 ++-- 2 files changed, 54 insertions(+), 37 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 6104470b31..4da8a7083c 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1391,6 +1391,51 @@ static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx) return 0; } +static av_cold int vaapi_encode_init_quality(AVCodecContext *avctx) +{ +#if VA_CHECK_VERSION(0, 36, 0) + VAAPIEncodeContext *ctx = avctx->priv_data; + VAStatus vas; + VAConfigAttrib attr = { VAConfigAttribEncQualityRange }; + int quality = avctx->compression_level; + + vas = vaGetConfigAttributes(ctx->hwctx->display, + ctx->va_profile, + ctx->va_entrypoint, + &attr, 1); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to query quality " + "config attribute: %d (%s).\n", vas, vaErrorStr(vas)); + return AVERROR_EXTERNAL; + } + + if (attr.value == VA_ATTRIB_NOT_SUPPORTED) { + if (quality != 0) { + av_log(avctx, AV_LOG_WARNING, "Quality attribute is not " + "supported: will use default quality level.\n"); + } + } else { + if (quality > attr.value) { + av_log(avctx, AV_LOG_WARNING, "Invalid quality level: " + "valid range is 0-%d, using %d.\n", + attr.value, attr.value); + quality = attr.value; + } + + ctx->quality_params.misc.type = VAEncMiscParameterTypeQualityLevel; + ctx->quality_params.quality.quality_level = quality; + + vaapi_encode_add_global_param(avctx, &ctx->quality_params.misc, + sizeof(ctx->quality_params)); + } +#else + av_log(avctx, AV_LOG_WARNING, "The encode quality option is " + "not supported with this VAAPI version.\n"); +#endif + + return 0; +} + static void vaapi_encode_free_output_buffer(void *opaque, uint8_t *data) { @@ -1572,6 +1617,12 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) if (err < 0) goto fail; + if (avctx->compression_level >= 0) { + err = vaapi_encode_init_quality(avctx); + if (err < 0) + goto fail; + } + vas = vaCreateConfig(ctx->hwctx->display, ctx->va_profile, ctx->va_entrypoint, ctx->config_attributes, ctx->nb_config_attributes, @@ -1621,39 +1672,6 @@ 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; - - vaapi_encode_add_global_param(avctx, &ctx->quality_params.misc, - 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; diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index c72fb9f00a..df6f39a946 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -831,9 +831,6 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) av_assert0(0 && "Invalid RC mode."); } - if (avctx->compression_level == FF_COMPRESSION_DEFAULT) - avctx->compression_level = priv->quality; - if (priv->sei & SEI_IDENTIFIER) { const char *lavc = LIBAVCODEC_IDENT; const char *vaapi = VA_VERSION_S; @@ -907,6 +904,8 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) avctx->profile = priv->profile; if (avctx->level == FF_LEVEL_UNKNOWN) avctx->level = priv->level; + if (avctx->compression_level == FF_COMPRESSION_DEFAULT) + avctx->compression_level = priv->quality; // Reject unsupported profiles. switch (avctx->profile) { @@ -972,7 +971,7 @@ static const AVOption vaapi_encode_h264_options[] = { { "qp", "Constant QP (for P-frames; scaled by qfactor/qoffset for I/B)", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 20 }, 0, 52, FLAGS }, { "quality", "Set encode quality (trades off against speed, higher is faster)", - OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 8, FLAGS }, + OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS }, { "coder", "Entropy coder type", OFFSET(coder), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, FLAGS, "coder" }, { "cavlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS, "coder" },