From patchwork Sun Feb 10 19:47:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 12028 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 ED9F544665E for ; Sun, 10 Feb 2019 21:47:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9F8368A88C; Sun, 10 Feb 2019 21:47:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0379B68A7E1 for ; Sun, 10 Feb 2019 21:47:18 +0200 (EET) Received: by mail-wm1-f44.google.com with SMTP id r17so13326869wmh.5 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=NaG1jlM6bKsf3zF9POamPSKAxUvwZp1mbcT7yRKiIi0=; b=KE6hHy/+qI1fz4F7s48a5QCeRiKTCSpL8tnc+PnBnbQJcvjt0+kGpoDdV+H5PbE5fR +May1cWJP39HaKLs3b+JDf4DkTEWlTzS48gorhLxRmNdVvUHsxX3yvmN/6K58kuNbYds lrV9bqhwGZS/sWCHCI6uZ3n+RY2G1n4o4YftZUJhbRb3ZqSVdVnAw4FDbfLBwcg0XoLA LdFUctadM76XmXQCaMzQ+cMuTnvF/EpYQFQo9jLqE1UHhJ65k1t0AmplSigIkynBhM+s pHuetJn62N01h0q7GvTyR/agRBhBJPdUWhXM5gB8MF84H/GwFvnxYsYs4akIPrM2WVlI UCsg== 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=NaG1jlM6bKsf3zF9POamPSKAxUvwZp1mbcT7yRKiIi0=; b=GnhC3rYL65yGCMb9w54Qj38VF6WuO3iL8iXAkXppnYTs8e17KPUv/XaOthkHEfPBhT C57ARQqUbWSwUDiBn6Z95tUlnVSd+lBPYhhILNAXOhrlaE/vgTrbqRLjOksE030t8vRf ucqVx8Z9sZu8DgDLQXPhXkyC2BbpwZ9uTAxGxWQzDX1xKpwNhhvhVrK4oX+EvPqToJBw o4R0C1MmnMvDw8PbQC/pL/d4nhVNhy6BRaYA3t8g+VseKb568kFI7DGTz7pVsGTTE2pG 7v6hBf3BraKJYshqtvMo4jX1jE81qKT81qut5cNbRf3vv8N8nKShca0Z4QDPlb79W1MW SyOg== X-Gm-Message-State: AHQUAuYzHZXN3ueH7//pFcl67UerVW1WR9aY6+NO68816lrZ+9jY+Pt0 PBr1w6qfOoCzl6c4GyScH2/bYEY3RKlK+w== X-Google-Smtp-Source: AHgI3Ib+5tNz6jRvArA1pt9+q6D3wZowqH69ErtPsWZUWg2Rc0IQfEp0EninZsD+CaTajcTTLD+l0A== X-Received: by 2002:a05:600c:2184:: with SMTP id e4mr6236834wme.129.1549828037117; Sun, 10 Feb 2019 11:47:17 -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.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 11:47:16 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Feb 2019 19:47:00 +0000 Message-Id: <20190210194705.3598-7-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 07/12] vaapi_encode_vp9: Fix whitespace after previous patch 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 | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index 8fb399f115..f89fd0d07a 100644 --- a/libavcodec/vaapi_encode_vp9.c +++ b/libavcodec/vaapi_encode_vp9.c @@ -182,21 +182,21 @@ static av_cold int vaapi_encode_vp9_configure(AVCodecContext *avctx) VAAPIEncodeVP9Context *priv = avctx->priv_data; 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((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((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; + 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;