From patchwork Tue Sep 18 22:30:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10362 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp11428jap; Tue, 18 Sep 2018 15:32:21 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda8V8tkvceIoRUFM4UF9LPYOZXur94T5HVGAmiDXBSQycZ59EvaHgGnHyMjJ30KyWZHvzfY X-Received: by 2002:a1c:ce0b:: with SMTP id e11-v6mr7523294wmg.47.1537309941640; Tue, 18 Sep 2018 15:32:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537309941; cv=none; d=google.com; s=arc-20160816; b=t6ifuYmiBh3merqQeY8WttBCrvyN6CTNGjSvZ6R0+FWsrRaD3x0Bnv9ZuqXLJparfx 1sRmDMtlJ0CLqHXoT7wiHadY53kXZKiQGe98N5Dk/96GjwvQRw9YafZN1nDa0lhxKOT9 Oqe9yXt//hI4fcve1dUHfUPdf2CAIFVpGUauPJesSsqL1zTxdlnsOMM/40JKzIGAOTv8 pSKt7IN1M4FSlbMDlXhMDV7GhPZIvy1IW15wGItbfw/aluK6IuYq2K2+DLynYzuwDD5c CJttTLVZxnYZaqlPSzHY4LYFu7iByzocKI5MESH4S2MMUeEexocRGEqJbLBdoq+cJkDV BYuQ== 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; bh=JnjU7ZkJcfXK7priGM/8myHPL8B05iWxVCQ+pJ1jfPo=; b=o6XDa7y67y3Y3sR8Qo9ZF7KB7Hs9myrdpwDpGJzNIrp8wyXYHmv7s1rXTduKdN6k8x Pulu6TUrLWVEotL20eFfbeQYLcEFIjameVnPtuZUYDLp69d4ZaP6INVWq8QczqEeAo+D aM6oUiqULIJjuR90iUtjKKUmtLhk8xieeXaXKxb/y60vVWKhJ2JDCNFLkWAMcneBp6Gt HmnoTdyRYHnTx+hblB66OQIjxoHGiJtQRlyrdIR1+wrP6YosO4kubkQsynpKpcRK73hr z1jQE6YfijCZG4PB2QZtalXyglIC8e4EVdfpwujH/TmbZFsscrfHbU47mOtabVPCuxib P1pA== 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=CoF2iC+w; 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 a192-v6si12183536wme.132.2018.09.18.15.32.21; Tue, 18 Sep 2018 15:32:21 -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=CoF2iC+w; 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 18EC568A36E; Wed, 19 Sep 2018 01:31:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A820C68A032 for ; Wed, 19 Sep 2018 01:31:13 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id s14-v6so3727527wrw.6 for ; Tue, 18 Sep 2018 15:31:26 -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=69rKnYOrkSvTYNTTDISwC7tkd6r3NQjPcTBab48f8+w=; b=CoF2iC+wtxtkMuT9svH1bFlatOlf4Jt2IaL7Wp0VBYs9hs8osjLR2L+991Xhwpq2W1 m3XGmwHmyqD5/XQSAXW8/Cz6d2koKznj5D6ry0KvXEFxHxmFReNWPngAg0cDN+H5P2nm qJqixMnP02Q1eunko/9vzEEyDLhedcmwhEUZGI1xivTJsitboVhSWhVTCaTd9f7L0yEz rBkXUr1/QoKuC5RnQYGUgF6X0X7BJAB/75jrkp/qdsCW6T1MGuFYmbG/hkqpfDR+pofN 4Urchm2ScW42OxzdugaMn58bCdwHfOqtCBFXp8ZQKEtJ9C12rgHDriXA5wiB14cTjmP3 Ln7A== 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=69rKnYOrkSvTYNTTDISwC7tkd6r3NQjPcTBab48f8+w=; b=InDm1HCymikD1yFt6oAVMzgN0agcAJzZ4vYtA/AVptgfFvBldXjoVQIe0a4G4xFto5 ykP5L0P7LX3JoIQQrHz6J1kxBgjbwlmFhYRvR2l1wy1SgkGnCtm/+U44IzUGa04d/iPa XLElyEXoJfA5IB9RJoSmTw81y8T2t8WYvxaoXeAXRIpEecdONx9hBBzu/HTrQ2hlbfaJ d8UkE/+6r08t1aW4DBOMILlqXKnqHbERJqztNQuMClaAPJnemr+TcrE637LMmq6G6aFM Ezw/xVVgnko9Z+uYKBrwsnTmNVFX66r3KFQDU/ChkVcNN9V/0j5EQySUlB95HfsHzwzL /zlw== X-Gm-Message-State: APzg51CyoVxv3s1ztrx1flIhWC2YJlrmJCWTqBi62XE7X3NMtve7i2Yr t3hy2kNeBFDJbOQ1PLv+7rO5TAKrjnk= X-Received: by 2002:adf:9142:: with SMTP id j60-v6mr26577487wrj.180.1537309885984; Tue, 18 Sep 2018 15:31:25 -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 e141-v6sm4863826wmd.32.2018.09.18.15.31.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:25 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:30:43 +0100 Message-Id: <20180918223116.14322-6-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180918223116.14322-1-sw@jkqxz.net> References: <20180918223116.14322-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v4 05/38] 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 f838ee5bd5..35a4e90f67 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1387,6 +1387,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) { @@ -1568,6 +1613,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, @@ -1617,39 +1668,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 5ef72b222d..69e95dd340 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" },