From patchwork Sun Feb 10 19: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: 12030 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 5332044665E for ; Sun, 10 Feb 2019 21:47:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E64E68A921; Sun, 10 Feb 2019 21:47:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4111E68A8BD for ; Sun, 10 Feb 2019 21:47:19 +0200 (EET) Received: by mail-wm1-f42.google.com with SMTP id b11so13424908wmj.1 for ; Sun, 10 Feb 2019 11:47:19 -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=FHjJG3dYHnoVUNioi12TqXru5h8vsod9B9jZyvbxUy1I5crar+d8H56Zp8JoYy4CwO kiX1WyafZHifPjo5BNLIVe+p+OLhqx3ngQ7pgJDR2p7tmGEIjU24qgtVbHBxLQA1Wo0Y nwiic/Zc7SfgXi+0/Zqon+qyZLsZW2JQYvVqlTyrboA/daz7a7GITupJH/K6s+MPXF/U 7yw5VmV2HYG7oZ3GlDDD7paZHdkRnZWhQYBRL64amKhg981ecTGPTDAqd5OgZrIjWQ+Z UXUrRD5V5y2l56ejmCrEc5X6z/Be4cxBlD2v24N+EwCsFfUNwPOOtqwybztKfJ1u+vK8 C9pg== 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=culqxxtshS+4gv/MuhJowakNRlzV2rFmT6vyW7EdXgCwvOhf3vyQgdlpS5tz6vQ9Jx +SZbQAYdlDLk79UdNVAUTFI8YP1rEZD1RguRP3KDf4cotkgpH3ka+YfQPEHAKmilPmL3 lers/oFD0Zi4dKoga2nwcdL68JZz/oP9382pWziJJ/Nzl56YtU5C9oq9Sv18hTb1DOW8 id6/+US8Dtlnfbdr6zZAztCrzziLUGq/To1bLuF7OvMfM+Ch1dfY2ouBziK1glrJB3ZO ERaLtjrAY3via4P8YWlXESJEA+mcllhoFup+Cn2VxyudDrBpxyQebL3ZT0q8VVjia1bq y5Ng== X-Gm-Message-State: AHQUAuZiKuAJyPQPUspWQ867MlZUmZagaQmn+LkxuJXcbK4EDiUV+Asg 4qJ9Bp8sbARDSkySNVQ1p0IyvfXvDnREVw== X-Google-Smtp-Source: AHgI3Ia3IeXSsnwZz1wpXdRZXNcuf9lI7se+Euo8VuBFiklDMoQ3x21gKF/JBACy7/Tm/MFPjqWEkQ== X-Received: by 2002:a05:6000:128f:: with SMTP id f15mr329773wrx.74.1549828038507; Sun, 10 Feb 2019 11:47:18 -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.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 11:47:17 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Feb 2019 19:47:01 +0000 Message-Id: <20190210194705.3598-8-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 08/12] 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 }, };