From patchwork Thu Dec 20 20:40:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 11502 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 B6EFC44CDFA for ; Thu, 20 Dec 2018 22:48:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5CA468AE6A; Thu, 20 Dec 2018 22:48:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64FAA68AE5A for ; Thu, 20 Dec 2018 22:48:08 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id f81so3646066wmd.4 for ; Thu, 20 Dec 2018 12:48:11 -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=QxSOTuK/JY89UDQMpP2IEK6SosE3ODPjphopicYc/skKeIGT89VhfgAXkWM0A94jwu MJUbzwrTT5zXtEx/kxPRIgXIhxioRwlafEa2PW4ltioBw+ubSFm8b4sXBJjpKRcgpwIF N0lyEWltoke5qSdAawpEtEDDjzj0ro7THMaymMpDxc9aKHRkjz50BFWIXZ45nTp4vKbz o/Ywd406HQinPG6AoFdg93reUnZffnrmiYq1H8+4VjdayXRH7acOekpUE1UN60vnRbgI WworWmpzNUE60wtFJ8kS6mNtoBcj8/mg2b+5jSRCHNRZ0zV9aGxm0l3OXW3GCLUCLt2R 7+Kg== 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=ah7DuXGWtwPoj5BweFxeIt68MxgxXkRl1T1J9eTioozhkRVZlIJSww+CUr8QQCcYIz kBcBtQlbjNQX8Y+++dCSVtjKIuVqeNtrPQr0RpIPKFwNTmBMePyH4iW7R4tONgp020RP n56bkW77HJHuwbYmTlaIyUq1iwHSfL6+i1FD92Ggn++RAQkwjajMVto3hupP2f5nQFUe 3I/i787DCTeY+9nESddx9tJogpUL0mgermkMeTApBGxvkVF8k/iHFEDBsIbS6PKnirih bOqVxZIeN+kPRsHoaVPv6Z9ZD2Ct4wSqOhQ8JvnTNTjekTBdERfjecw1nJ0XpPCl0xcd H69A== X-Gm-Message-State: AA+aEWZzVNiPkki+faG6hTf84dtaVhrrjefscjWBwZv1iw0Z7Jctja4z QgiycMbGA5IuWZBJqDYAEQkX06kqxhU= X-Google-Smtp-Source: ALg8bN4EFh7eFRGCoAQ+pCSBqN1DpV/Q3FKT8qaXOWMX9djv6g0hcBzv0sNK+fD5VaLLpXxifphctg== X-Received: by 2002:a1c:bdc5:: with SMTP id n188mr142266wmf.69.1545338425895; Thu, 20 Dec 2018 12:40:25 -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 x10sm11956884wrn.29.2018.12.20.12.40.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Dec 2018 12:40:25 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Dec 2018 20:40:06 +0000 Message-Id: <20181220204008.32766-12-sw@jkqxz.net> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181220204008.32766-1-sw@jkqxz.net> References: <20181220204008.32766-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/14] 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 },