From patchwork Thu Dec 20 20:40:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 11499 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 C27B744CD48 for ; Thu, 20 Dec 2018 22:47:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFFD568AE30; Thu, 20 Dec 2018 22:47:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4A1268ADA0 for ; Thu, 20 Dec 2018 22:47:02 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id m22so3669443wml.3 for ; Thu, 20 Dec 2018 12:47:05 -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=IEmE3sUg+uFYAadMBHqPfkNUA+sz63NjExgXhuO9SAcAWkS5bS2nqcmymAqOEkiguV /MP2VxacMklrbFEEthK68ksfrOuelR0VcADgLalgVlf7bPS5OOehFwQwHG8kWmxjsmHU 2KrTbQRWhQiEW53dHy013bbPBTKBlcXZ5mlsDLxUO65RvuYTstjyZMqSHOKEMhxQf5rP i5dl7jFTAaGoapL1Rtft9IM5nizKuFxs9fzrfpJVMzNEX/bCdJA0512Oe6GK0egANuHW 0a1XatHfuTn271E/2vfbtmY5WkICh4kW0kcmNdKHiUSL/KLLMrX0CLS4a9S0Lk0C8Ssr NGwg== 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=E8BsnrzhW4bpvSv7AArltrRdtDkxwfPzaWnelmzLB1T7MeMLbkytD2pwuG2VKNcY0h PjkBNSGm/+y4Pzwxp/YfEEiKs6At+xR1DX3f3VvonRQ+imTmI3nHax8bum1l03jm3rFP OwHaJwrHHlVPUMrCmaW5mAsgZxxIBY9lgWRPFCdmHBgvfjwbtW9JFtjnnf70lbPluz1Q /zHwAuZV0ZeVGpGaIEIS1EKjD4RT1JxFu7+nig01Dnny0SJtEzZT5yossvqZbIXd5HbG B3oDC4RpQymh4fEyVu2BEZX4BfLgakUctxbqxGFP1LgQ6S0dFB91TMbVIqp+s1ggbuvq nNxg== X-Gm-Message-State: AA+aEWYlYDN1uRYfMBxTnP5RkcuGcuzl1MH00jZYSwrjA3SkT0SKbmpu K8rZ7LePPgERKTzypnZVcKKJQl/d36A= X-Google-Smtp-Source: AFSGD/UmIY+YQ+BOj2aO42cXicJRtldiYNuIWeV3x9RWW0GDN46yXUVvpUzOORPSkKZfAGS3D/ZPXA== X-Received: by 2002:a1c:4c10:: with SMTP id z16mr130963wmf.117.1545338427049; Thu, 20 Dec 2018 12:40: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 x10sm11956884wrn.29.2018.12.20.12.40.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Dec 2018 12:40:26 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Dec 2018 20:40:07 +0000 Message-Id: <20181220204008.32766-13-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 13/14] 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 }, };