From patchwork Sun Feb 16 19:31:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17804 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 DD1FC44B169 for ; Sun, 16 Feb 2020 22:02:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B9FB56881CF; Sun, 16 Feb 2020 22:02:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54EB1687F99 for ; Sun, 16 Feb 2020 22:01:58 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id p7so14294406qkh.10 for ; Sun, 16 Feb 2020 12:01:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q9Kmd2MGQPI3Hd6XnhegaXixtAjfPPxzRzuNW9iCPSI=; b=P+juVcavaMDoI4iQRxc/VA950P6/37/vSzDoIkvnsdN9fVlAD4LMLDXrBPyjH0yXdo lzgLm4W1cc4M2ioBG10zhFXpXw13ybXDiZK9LbbmUtFzpMWblcp7gTQwbtNUXknlOhee ZZSNioPds43+G3SLWhN7MPt3Km7ulMGadvsJ4sbN8fWYBuz82yA372AEQhEeWz3+Rtuy Zw6vxPs1wnk4mKg2Qr1FWlDRltSanUUUPZSV03qIprBFRrXo7umFzs9lDIiqB1MuFFid /9Zal+1u9SnaTRty2M9wn6YYMixK6r0x2bWdfNYRHc5NIKGCTGv9+nh69ulFYaxKXR7N g2zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q9Kmd2MGQPI3Hd6XnhegaXixtAjfPPxzRzuNW9iCPSI=; b=hIGsHYlL72oL1KIhtZXwllwIwlrWt1vwTj1NU5RVWg2Boh9rURBczxk4I5LTTIwe7O lKO2Mz1XDeCeqpkiQC2nLUJaN8d62y00Jx1gY+yNv705L1XBvoQ5FVdZ0fDK+B2qmC07 JQNZkKVCqIjviBwI518Xp9gTxlTkjHyWa8Y1BMW9B8aLh85W5iUlSzUetVx2U38igSWQ oAH1e0hk8iUroyDw5ZGfbnEpJpx9p94ul0D/7MokK/MkA6o3RGJlTBfaXt4a954OiaFN XoG1dod9LlGAaNiXBgPVCEWKkydWf9zLAPdKlDul4Q4srj9r4DeF77H0moGFZIyAqd3X KkMg== X-Gm-Message-State: APjAAAU6oLRRPoWAm4zZaD/ybIUm8crtqzd1WWNQPtrUX9L5PwU3Gn6v pZV2Lw7nKPl6fn64W3wMPz2LiqkQ X-Google-Smtp-Source: APXvYqybkIbRA0P3jWqBTZkRxTqVWWDT+yEHca0XfqVCQeZLO2YvFtSWsq3Qnn+kka1R9y2Xf3TP7A== X-Received: by 2002:a37:9fcd:: with SMTP id i196mr7149969qke.124.1581881518038; Sun, 16 Feb 2020 11:31:58 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id k5sm7617348qkk.117.2020.02.16.11.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2020 11:31:57 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Feb 2020 14:31:43 -0500 Message-Id: <20200216193144.14169-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200216193144.14169-1-andriy.gelman@gmail.com> References: <20200216193144.14169-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/3] avcodec/v4l2_m2m_enc: Support changing qmin/qmax 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 Cc: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Hard coded parameters for qmin and qmax are currently used to initialize v4l2_m2m device. This commit uses values from avctx->{qmin,qmax} if they are set. Signed-off-by: Andriy Gelman --- libavcodec/v4l2_m2m_enc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 94373b3b6e7..5410cffe4a2 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -31,6 +31,7 @@ #include "v4l2_context.h" #include "v4l2_m2m.h" #include "v4l2_fmt.h" +#include "internal.h" #define MPEG_CID(x) V4L2_CID_MPEG_VIDEO_##x #define MPEG_VIDEO(x) V4L2_MPEG_VIDEO_##x @@ -233,8 +234,11 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) return 0; } - if (qmin != avctx->qmin || qmax != avctx->qmax) - av_log(avctx, AV_LOG_WARNING, "Encoder adjusted: qmin (%d), qmax (%d)\n", qmin, qmax); + if (avctx->qmin >= 0) + qmin = avctx->qmin; + + if (avctx->qmax >= 0) + qmax = avctx->qmax; v4l2_set_ext_ctrl(s, qmin_cid, qmin, "minimum video quantizer scale"); v4l2_set_ext_ctrl(s, qmax_cid, qmax, "maximum video quantizer scale"); @@ -350,6 +354,12 @@ static const AVOption options[] = { { NULL }, }; +static const AVCodecDefault v4l2_m2m_defaults[] = { + { "qmin", "-1" }, + { "qmax", "-1" }, + { NULL }, +}; + #define M2MENC_CLASS(NAME) \ static const AVClass v4l2_m2m_ ## NAME ## _enc_class = { \ .class_name = #NAME "_v4l2m2m_encoder", \ @@ -371,6 +381,7 @@ static const AVOption options[] = { .send_frame = v4l2_send_frame, \ .receive_packet = v4l2_receive_packet, \ .close = v4l2_encode_close, \ + .defaults = v4l2_m2m_defaults, \ .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \ .wrapper_name = "v4l2m2m", \ };