From patchwork Sun Jan 27 23:47:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 11886 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 04BD044DDD3 for ; Mon, 28 Jan 2019 01:47:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 275A068B01F; Mon, 28 Jan 2019 01:47:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0843B68AFD6 for ; Mon, 28 Jan 2019 01:47:06 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id u4so16122554wrp.3 for ; Sun, 27 Jan 2019 15:47:26 -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=PnlVt7UCBiyAf5JMf/qLkEiohaye5q8EiKGBsry8vWlS76aXPO45s4v0WgMS/oYHnU 8YhcGdyKpvWC7VyEJAsGqfXG2yFXwTF26ZKC9RCjTQXD1YW/T/7G723S+e4v19CxV+No FXZqnmIjkoJ/CJ/Cw1I7TUaRabrDBYE3r0IXvYhpkNWgYtV2b+iHak5twFTyV4NT+IKR 9L9/lYV1Om7GtcuoA3H6MqNkAmurTgk9JCrqU/VfMuy0rq9ajiSzPQhiYdBC6GenFbL7 PWf5F9mwf4vdLm1pbLVZ7zJo3jjZp9o2F5gIO+X/JtBDM10rG4OxeF6WPF9pwvA0A5Qg lxsA== 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=TXyOpvrz1TDBUdwT+3ciSgmJfhB66c+69R0JfM3Tz03+iSLdTyvZn3nkvyUwD+mH3c 6fDjLkZ/BvJyP75ksWqR0c+09OH2qYxOte34tTQWzdF/1+3J/Y7yaCg5U4N5ESLTEwf9 Rv5lPnm247LwMLnPDCAS180Pj8mFsRvpL/INUAQVJgei1S6Go3bjwKF1xooCnZJzOSme 54pjdAwp9u/npVKKjdB/XLFCgwSQCRyugf/G2DkUUBpH+wBcD4OVEv3NBBYjIwG+BxrO 4HaccV2H8kwUKGrJyH+6iBDpIbCO2vzopB6KZI6omyN+rXWf+vSoVsO/RtakMXlm3M6h CEeA== X-Gm-Message-State: AJcUukcVIlJI4p52SfFw3eLzVPH4klFak0iJ21wE+2qmCDG0hYdUjjKO x6O1STDViSwNzrvwwIgSAxQHi2LSEAk= X-Google-Smtp-Source: ALg8bN4iUC9pARVSdQoxURrnWwbqVUGw+94z38FFzDad0ZqJ/4gM94nAz3nPeq9zcexAlEnsNLNFQA== X-Received: by 2002:a5d:6a42:: with SMTP id t2mr21004730wrw.50.1548632845276; Sun, 27 Jan 2019 15:47: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 g21sm3642603wmd.0.2019.01.27.15.47.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 15:47:24 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Jan 2019 23:47:01 +0000 Message-Id: <20190127234707.27689-5-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 05/11] 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 },