From patchwork Sun Feb 23 18:47:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17874 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 F3B2544AF89 for ; Sun, 23 Feb 2020 20:53:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8D8E68B47A; Sun, 23 Feb 2020 20:53:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5595068AFEB for ; Sun, 23 Feb 2020 20:52:59 +0200 (EET) Received: by mail-qt1-f194.google.com with SMTP id i14so5133853qtv.13 for ; Sun, 23 Feb 2020 10:52:59 -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=Ix5j2K3y9rTFiVQnvzw5ijpqisciCFponbtmH8I3YKI=; b=N+7g5Szh1g93NllB4KFPj3Acd5WX+wZ0Gf2T52AiyduO/Z/AVKZAQt5NxVlcG9kM+U qH3RxTWmX412gDpBlJiWVpT04faF+cdu2NF7fSE+8TaB12qcDPULZ6Qh9F7ubrm7tsUM 8Xgb8GVoYdrewW/uSU0lCOppguTJcfvIAFG3t4AaM2fPkvFwCJc1VkUiblrSlhL/E6KO RNRF677gYjBt1iQrnoJTIR6yUPMCZHFQPSqvUBRYnfL59dl9R0T9qnp+EyZ4kM2JITB6 Lx45pg6TpJRjpS/5AZHy0FZeeQZqkb2xWbuNQMkLHW5PIWEIpR1Q+cru4iVDkpml4urH jkUQ== 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=Ix5j2K3y9rTFiVQnvzw5ijpqisciCFponbtmH8I3YKI=; b=eZDdl+XR3Hb9Hm9f04FJCU0fcrTC1Ohr7mS7BmwcpD/ufZ5C9QLqFZl63CP+M02YmJ fSzMFtyjGogBzUiBbmROTiv8bN11gY81+vUhjQZ6s9mIayoiJm5EBTIRtJrKpD3eZpEO 9iWiaO3EQOHeG1CXonxX9/65SvKkle8dhLppJFo4h5ntN3VfLTj50KBK76tlxVs03yB/ R/0TxtHExPuQfB44dMvJcbT6AqA2CCh4xwEyDPGL9H2UalXmFoZt7X7d/v19rQQbnFV/ MTqsgQCvGjHdu2eWBRn0HCJOzUyDIQJDMrdrnxTenR9mm6oYPDJMb+gXUA+/ZOYCO3CP 6AwA== X-Gm-Message-State: APjAAAVHos31V2IINQVNGdGWJxN8E63NSvjY1QdjveyzQYR0Jbw/fZSO +Vz14QGVED/UudPzYjEcKlVyTF4Y X-Google-Smtp-Source: APXvYqwuoLl5lbg96WSxjfeGdMhf/sY2giCq7C1rABsj+UgjsFSVX+/6pJCwiXoD7wokK4bfdrIM1g== X-Received: by 2002:a05:620a:22b6:: with SMTP id p22mr42771406qkh.35.1582483664409; Sun, 23 Feb 2020 10:47:44 -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 v80sm4766102qka.15.2020.02.23.10.47.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2020 10:47:44 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2020 13:47:33 -0500 Message-Id: <20200223184733.13113-3-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200223184733.13113-1-andriy.gelman@gmail.com> References: <20200223184733.13113-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 3/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 | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 0098d5314bb..500a0b757e5 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 @@ -239,11 +240,16 @@ 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; - v4l2_set_ext_ctrl(s, qmin_cid, qmin, "minimum video quantizer scale", 0); - v4l2_set_ext_ctrl(s, qmax_cid, qmax, "maximum video quantizer scale", 0); + if (avctx->qmax >= 0) + qmax = avctx->qmax; + + v4l2_set_ext_ctrl(s, qmin_cid, qmin, "minimum video quantizer scale", + avctx->qmin >= 0); + v4l2_set_ext_ctrl(s, qmax_cid, qmax, "maximum video quantizer scale", + avctx->qmax >= 0); return 0; } @@ -356,6 +362,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", \ @@ -377,6 +389,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", \ };