From patchwork Sun Jan 27 23:47:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 11884 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9F6E544DDD3 for ; Mon, 28 Jan 2019 01:47:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C561568B025; Mon, 28 Jan 2019 01:47:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2133068B011 for ; Mon, 28 Jan 2019 01:47:07 +0200 (EET) Received: by mail-wr1-f53.google.com with SMTP id r10so16077977wrs.10 for ; Sun, 27 Jan 2019 15:47:27 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=Uh9OsN7lPzS0L2jm7dXOz103Ytio+pKmGAMJKw59o70=; b=NfiMZD+8mjhN6Abf/zNiwwBa3vCVJ4bydKemnkzGwC6rYYTCjhOes7gg9OkH63xxJC gd4RGj/7eF4s76gUXFyiVpVl+gUzy/a8hq1vir68OMMg0nEArnnJjYurgO9lG1m+DgRl Ofg9PsQ/9KsmU1rXjzKxZ8s+N5Y8//nG05sqNfXXhDDxSfSS1lfbJPR3oM2i7rjzOvyC YWU3aI4KuL17GdjVcDMKx6QqyTZajXvozuTdaP9Ftslo8moe9oORa4APKO5eVxKUTNTQ ogGwdbAjkSb5uKMLIG/GzeAeFDW9a97JOMoafDtH2HSZX6AXJ9y9S8d9OfOyK03uSet0 NGwA== 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:mime-version:content-transfer-encoding; bh=Uh9OsN7lPzS0L2jm7dXOz103Ytio+pKmGAMJKw59o70=; b=nSBWCv732JQewdUxjaX3E0AHZ3WWo7MLRoaQMFjFN1OatrmwATj0cDoGpD+UW6s6AS C3feqX2XmhNtD9VghWo107jv03J4p7d76hd/kW/yTbgW1v9IBMy/lX8M1lpct4EvNFbI W+uipTF6nYNg78Goat8mbpkX/v1toMtyfYQNHQ3lM7Iq0SYfTFg6hdME9dfXwjBN+4OZ 8PfeEcgoJxNbK0+JjkSXUJRFMWnHTAsxvXRsR/MOyqsvJ2oxVhaKUPcPI79nxURLkds0 5hxzGr2l2qkHw1wF+uDa+irPLUstN0Yh+Tcma1jqpLNAHsQGaMwHcBJWaz3nUkQJ1JRY 8JZA== X-Gm-Message-State: AJcUukeMcp97YX69vzM/obZJAMjHnnDoECW/pm+ucWT1526Q/alscTrW O6G9m8Y4T3sORlng3JPOqpdTMhI5+YI= X-Google-Smtp-Source: ALg8bN4HoZzNNTGhUBK7Fsb6ROLfymQwr64aFHlT/EwNWZjLCBSBZGvIdZnO5W6V8M1eIv/jsnS5Nw== X-Received: by 2002:adf:f848:: with SMTP id d8mr20756694wrq.178.1548632846301; Sun, 27 Jan 2019 15:47:26 -0800 (PST) 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 g21sm3642603wmd.0.2019.01.27.15.47.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 15:47:25 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Jan 2019 23:47:02 +0000 Message-Id: <20190127234707.27689-6-sw@jkqxz.net> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190127234707.27689-1-sw@jkqxz.net> References: <20190127234707.27689-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 06/11] vaapi_encode_vp9: Enable support for more RC modes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/vaapi_encode_vp9.c | 41 +++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index 97142dcc49..f89fd0d07a 100644 --- a/libavcodec/vaapi_encode_vp9.c +++ b/libavcodec/vaapi_encode_vp9.c @@ -178,23 +178,29 @@ static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx, static av_cold int vaapi_encode_vp9_configure(AVCodecContext *avctx) { + VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeVP9Context *priv = avctx->priv_data; - priv->q_idx_p = av_clip(avctx->global_quality, 0, VP9_MAX_QUANT); - if (avctx->i_quant_factor > 0.0) - priv->q_idx_idr = av_clip((avctx->global_quality * - avctx->i_quant_factor + - avctx->i_quant_offset) + 0.5, - 0, VP9_MAX_QUANT); - else - priv->q_idx_idr = priv->q_idx_p; - if (avctx->b_quant_factor > 0.0) - priv->q_idx_b = av_clip((avctx->global_quality * - avctx->b_quant_factor + - avctx->b_quant_offset) + 0.5, - 0, VP9_MAX_QUANT); - else - priv->q_idx_b = priv->q_idx_p; + if (ctx->rc_mode->quality) { + priv->q_idx_p = av_clip(ctx->rc_quality, 0, VP9_MAX_QUANT); + if (avctx->i_quant_factor > 0.0) + priv->q_idx_idr = + av_clip((avctx->i_quant_factor * priv->q_idx_p + + avctx->i_quant_offset) + 0.5, + 0, VP9_MAX_QUANT); + else + priv->q_idx_idr = priv->q_idx_p; + if (avctx->b_quant_factor > 0.0) + priv->q_idx_b = + av_clip((avctx->b_quant_factor * priv->q_idx_p + + avctx->b_quant_offset) + 0.5, + 0, VP9_MAX_QUANT); + else + priv->q_idx_b = priv->q_idx_p; + } else { + // Arbitrary value. + priv->q_idx_idr = priv->q_idx_p = priv->q_idx_b = 100; + } return 0; } @@ -211,6 +217,8 @@ static const VAAPIEncodeType vaapi_encode_type_vp9 = { .flags = FLAG_B_PICTURES | FLAG_B_PICTURE_REFERENCES, + .default_quality = 100, + .picture_priv_data_size = sizeof(VAAPIEncodeVP9Picture), .configure = &vaapi_encode_vp9_configure, @@ -244,6 +252,8 @@ static av_cold int vaapi_encode_vp9_init(AVCodecContext *avctx) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_vp9_options[] = { VAAPI_ENCODE_COMMON_OPTIONS, + VAAPI_ENCODE_RC_OPTIONS, + { "loop_filter_level", "Loop filter level", OFFSET(loop_filter_level), AV_OPT_TYPE_INT, { .i64 = 16 }, 0, 63, FLAGS }, { "loop_filter_sharpness", "Loop filter sharpness", @@ -255,7 +265,6 @@ static const AVCodecDefault vaapi_encode_vp9_defaults[] = { { "b", "0" }, { "bf", "0" }, { "g", "250" }, - { "global_quality", "100" }, { "qmin", "-1" }, { "qmax", "-1" }, { NULL },