From patchwork Sun Jan 27 23:47:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 11887 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 581D544DDD3 for ; Mon, 28 Jan 2019 01:47:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 80F4468B030; Mon, 28 Jan 2019 01:47:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0187968B01C for ; Mon, 28 Jan 2019 01:47:07 +0200 (EET) Received: by mail-wr1-f49.google.com with SMTP id v13so16088937wrw.5 for ; Sun, 27 Jan 2019 15:47:27 -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=HaaZsA4AlxzAKij1C+VB3QQT0IZYpW+Udxz/RN4y6lo=; b=ZsJVXIEhZqFSUBEBevzhsTgaywomoaUzlm+YdnM/MLIMYH9KanN49SNllwJQLz7E7p V4msJCOkMFW8X2xEN8KgG3Sr+pKAPYvzuPuuS06s/HyXH2qaGLl/lmLWgZEw29/up+7I BwC9fP/PBmACo4Qk4IpIgx5hcEKOi7p7RrRpfJIgUq4oJXIZu6V+l1yqQYGaOeq5Ykar qQ4zUaAeIXEGerU0c4dyEtsLq9Tbz3yrY7SAAPcCxwXolc8E2u+7qRBViKkot3aJBU53 vAlW/e5HuMsVOZ9jnPOeHljx9t7/YEEX/awvniZP/occQGhfHCVH7U6OfdwA/GdWAdpZ 9QkQ== 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=HaaZsA4AlxzAKij1C+VB3QQT0IZYpW+Udxz/RN4y6lo=; b=rgriB/UF3gvHsYsl108T7C/LCC8tqZ0cyDYX5A1+2XphHXuxOQLHmtnEbO42lJudpn ePoAKrq5QKrNxz9HML6sLDv2vgVJD9hzB7vCEJH5RugyFrgkwY5Kmw0/l6ysHyuQ54yh B7A1vZy5tsvSGo3O2BFnzVF2wOoRPGyk+2etoyXXY44hu5x11zv/lkDPidP2BACGvchJ 32GvG0uMehaI1+/k6wjX7G77dR+rNA7GZ1y3BI1nRij/5/99vX/bsHSXaIcXrOAmsRaa PSjbSquInBu25UxON3sckCY609ZTh1AwetIcnq0SVOD80W3Eafi3Gan1kGIJ7I22/zr/ 1Otw== X-Gm-Message-State: AJcUukcKobptYLSUf0Je9SxBBiGRDW8DkWrKbLXTZIma/Jbdctex6lNY pmglnkDdoqi6TPTKD2WOvRI2Zfx0WT8= X-Google-Smtp-Source: ALg8bN7jK0+tNeAuPoI5Ra9HH+ahapFSytkUcai5J0vHrdPmUu+Fa+QhY26v4eV127VMPF3BezB9KQ== X-Received: by 2002:adf:f149:: with SMTP id y9mr20891430wro.284.1548632847174; Sun, 27 Jan 2019 15:47:27 -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.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 15:47:26 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Jan 2019 23:47:03 +0000 Message-Id: <20190127234707.27689-7-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 07/11] vaapi_encode_mjpeg: Use common quality option 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" Doesn't change anything, but makes the behaviour better match that of the other codecs (the CONSTANT_QUALITY_ONLY flag already ensures that CQP is the only RC mode selectable for MJPEG). --- libavcodec/vaapi_encode_mjpeg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode_mjpeg.c b/libavcodec/vaapi_encode_mjpeg.c index f0ea292098..350800697f 100644 --- a/libavcodec/vaapi_encode_mjpeg.c +++ b/libavcodec/vaapi_encode_mjpeg.c @@ -438,7 +438,7 @@ static av_cold int vaapi_encode_mjpeg_configure(AVCodecContext *avctx) VAAPIEncodeMJPEGContext *priv = avctx->priv_data; int err; - priv->quality = avctx->global_quality; + priv->quality = ctx->rc_quality; if (priv->quality < 1 || priv->quality > 100) { av_log(avctx, AV_LOG_ERROR, "Invalid quality value %d " "(must be 1-100).\n", priv->quality); @@ -483,6 +483,8 @@ static const VAAPIEncodeType vaapi_encode_type_mjpeg = { .configure = &vaapi_encode_mjpeg_configure, + .default_quality = 80, + .picture_params_size = sizeof(VAEncPictureParameterBufferJPEG), .init_picture_params = &vaapi_encode_mjpeg_init_picture_params, @@ -536,7 +538,6 @@ static const AVOption vaapi_encode_mjpeg_options[] = { }; static const AVCodecDefault vaapi_encode_mjpeg_defaults[] = { - { "global_quality", "80" }, { "b", "0" }, { NULL }, };