From patchwork Thu Dec 20 20:40:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 11501 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 3CBCC44CDFA for ; Thu, 20 Dec 2018 22:48:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5CC2868AE32; Thu, 20 Dec 2018 22:48:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6E6468A668 for ; Thu, 20 Dec 2018 22:47:56 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id f81so3645584wmd.4 for ; Thu, 20 Dec 2018 12:47:59 -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=d9+AuwX9i0D+tF9MycvcHMDcjLbjLekwYh3WgpMoNT4=; b=Mv/hMt/0RMyHgR07kCyFxz5QBAlTJI1py+k1r9pGTKlyUDD8i1heDJGchGj1LOMPmD WpdudehNAeMGn7hxSK9eTCwUHwYMq6q6KxgtysK66g8JWlWh6eSKvh8z1NCROnQAwKV/ r7nA1bn1TXmpE1Je7UDYea/FEcjMW6UUTSeGug4HMXHvcoHsHXEIgnhGjYP7wk9oEwgW 09AXOyqxe2qhLgV6VBRMf93uJMUYXUGx9S0jT+QyguEgKFfMFjeC07Tl4oSGdZeVWk2h wZ9DkW4q4gq1Zsi+l5UOm5+yDuOvepijIu+J8DNId8ryNiXuKFV6yiHJSilKMMh/8F/r INvg== 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=d9+AuwX9i0D+tF9MycvcHMDcjLbjLekwYh3WgpMoNT4=; b=Z6pYpOPDkHDHru9j4uVc8z2UV2lDqQqbsCBoL2iYAaSHnkIB8eY0X7Z3GPyvS/kzey 1Uy9EqWoL173xw19YnWeVh0FKMOvNs/nQpNBdgQuoekJs08nnAWdTJQuBIVoTcWd0ys2 fv61cGmriqOyHjROUjkfE/MNI0cE6TqoPMcU3dW4qrO/hMeslFrSyIZvL5wPf4BsyuTX 4a5u+/pkVkWcso7snBOV3s893e96mKC4M1TMDh8seeN7bzYmIC/H9gtzBM0h3MhqozdS xkSWeWntTneBz99LVwkQj5Dh/U15ZzbmToZmWjX5y+hGuxNDmfob47gX6qwI2Ac//w32 tqtw== X-Gm-Message-State: AJcUukck/Pmqche/Kyurjl0FoXzYmZv7JVeQ2cXq2eXofmH1VyENqsVz M7ItSUGkMTCl9xVZZSqSEMo8b2/NfgA= X-Google-Smtp-Source: AFSGD/UTfBa+i8XrMXP2Yk6Ae2R27jcFDogssPBUeDcZUZIulmHrj+WjT0fIiP4FQ+8e8QI9Ix0edQ== X-Received: by 2002:a1c:cf0d:: with SMTP id f13mr153636wmg.70.1545338424857; Thu, 20 Dec 2018 12:40:24 -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.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Dec 2018 12:40:23 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Dec 2018 20:40:05 +0000 Message-Id: <20181220204008.32766-11-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 11/14] vaapi_encode_vp8: 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_vp8.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/vaapi_encode_vp8.c b/libavcodec/vaapi_encode_vp8.c index 166636cd84..ddbe4c9075 100644 --- a/libavcodec/vaapi_encode_vp8.c +++ b/libavcodec/vaapi_encode_vp8.c @@ -161,14 +161,15 @@ static int vaapi_encode_vp8_write_quant_table(AVCodecContext *avctx, static av_cold int vaapi_encode_vp8_configure(AVCodecContext *avctx) { + VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeVP8Context *priv = avctx->priv_data; - priv->q_index_p = av_clip(avctx->global_quality, 0, VP8_MAX_QUANT); + priv->q_index_p = av_clip(ctx->rc_quality, 0, VP8_MAX_QUANT); if (avctx->i_quant_factor > 0.0) - priv->q_index_i = av_clip((avctx->global_quality * - avctx->i_quant_factor + - avctx->i_quant_offset) + 0.5, - 0, VP8_MAX_QUANT); + priv->q_index_i = + av_clip((avctx->i_quant_factor * priv->q_index_p + + avctx->i_quant_offset) + 0.5, + 0, VP8_MAX_QUANT); else priv->q_index_i = priv->q_index_p; @@ -185,6 +186,8 @@ static const VAAPIEncodeType vaapi_encode_type_vp8 = { .configure = &vaapi_encode_vp8_configure, + .default_quality = 40, + .sequence_params_size = sizeof(VAEncSequenceParameterBufferVP8), .init_sequence_params = &vaapi_encode_vp8_init_sequence_params, @@ -215,6 +218,8 @@ static av_cold int vaapi_encode_vp8_init(AVCodecContext *avctx) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_vp8_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", @@ -226,7 +231,6 @@ static const AVCodecDefault vaapi_encode_vp8_defaults[] = { { "b", "0" }, { "bf", "0" }, { "g", "120" }, - { "global_quality", "40" }, { "qmin", "-1" }, { "qmax", "-1" }, { NULL },