From patchwork Sun Feb 10 19:46:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 12032 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 2005944665E for ; Sun, 10 Feb 2019 21:47:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F421768A8CA; Sun, 10 Feb 2019 21:47:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B57568A65F for ; Sun, 10 Feb 2019 21:47:17 +0200 (EET) Received: by mail-wm1-f52.google.com with SMTP id f16so12912754wmh.4 for ; Sun, 10 Feb 2019 11:47:17 -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=f0pfOZTDXNuqHe+hg9QMSkTxa5fZmWS8SHDYw6CLIts=; b=IFRjO1d+MJRP3nTSk5ayk2cEtAE3A7/OfytjNeKxzMFqB6Lmvn+R8NH6G2U6FJuXx+ byNs/8+lrPD5ozvxHkMySWGWlRWuUerRDWGExCOc6HHeBZy9TiJntOsqRfpBI26I7hF2 ip0qHwMJNUdR4U8G8UZyufnEsgPMHAWkYNsh4H2BC3tNuCTKMBu95cpuG9qzXS2eDgoA VY9SeXWBtTQ7uA5TJ5ejx1yiAgWfSjd4ZaSlBR8K+9gQa3Wi9+dWzPNbmfWyBclzyIF1 dTIVwAG+2WEmegCjfmfsu0CDSxQUphyADGvRYsynCVa6owD4aXmbXQtmR0IEW/CCaDSb 6YNA== 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=f0pfOZTDXNuqHe+hg9QMSkTxa5fZmWS8SHDYw6CLIts=; b=TQyYu12beD3D6y1Zka7OiC71MZL0yrhBRMZz3HCn3CiKuaYW8jE0IVbav2Z7Hlg0mI pun5BcJLcRI2ylpQFJwxQtqMIsSBOyZFMBMlrQDIUWSfDFW/acpkQgnevKNJ3DektQX3 SiATTfw2HGVmf61OjPw6IgUae6SCBkbvYs0UtVfFr5zRU3JefJHjGPEWlnmX/KCQzH+g 7uZ24/+ZGyNaA52WP8WHGBPOzmSgeEh2aK0immPT/MdyDP5Wr/4TwTngdM7FefyNLdSi olNVrVsMdByhzZBN3EYLSD9S5nCXoidMNexyQa/uti2muMdO2KiAAxphKW7JEpBa+XDw uCuA== X-Gm-Message-State: AHQUAub41ybiARVUGKruyxWilPpa55yZw/GQXOM/y+okk7VcHshPWwbw 9pe5CwHY0VH4vJkHV7MUKimqgSrEcO1Sog== X-Google-Smtp-Source: AHgI3IYm2AaRVPp72a3bPnYd2WY4LPXHNJSpUY+7g4WPBOfVrouqu5gmz/te+bWkMwNyhKLgwcIEoQ== X-Received: by 2002:a5d:6346:: with SMTP id b6mr6430302wrw.118.1549828036299; Sun, 10 Feb 2019 11:47:16 -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 u15sm24059889wrm.63.2019.02.10.11.47.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 11:47:15 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Feb 2019 19:46:59 +0000 Message-Id: <20190210194705.3598-6-sw@jkqxz.net> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190210194705.3598-1-sw@jkqxz.net> References: <20190210194705.3598-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 06/12] 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 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index 97142dcc49..8fb399f115 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 (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->global_quality * + priv->q_idx_idr = av_clip((priv->q_idx_p * 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 * + priv->q_idx_b = av_clip((priv->q_idx_p * avctx->b_quant_factor + 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 },