From patchwork Sun Jan 19 19:54:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17425 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 5C79E44969D for ; Sun, 19 Jan 2020 21:55:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 38A7C688108; Sun, 19 Jan 2020 21:55:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f68.google.com (mail-qv1-f68.google.com [209.85.219.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8594C6880FD for ; Sun, 19 Jan 2020 21:55:42 +0200 (EET) Received: by mail-qv1-f68.google.com with SMTP id u1so13099436qvk.13 for ; Sun, 19 Jan 2020 11:55:42 -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:mime-version :content-transfer-encoding; bh=I2KozgV8LsJ3oghDbBwD7JWJSY8BiOWc0iXvqxoUFxU=; b=uF8NtXjPTgV+anr8iXFj8jwcu8rsAanRLna50NFGWpfxzuplcq+3InsHK+nWBMZvrK 5Ee/dTTdMW6HZEHgKsk9KGJo37LSWETT3OdRI1Iz9pCHWgikQM0vTa0eOVkgd+llJYOO pmoE6A6+X2lbTnXk+eACMKNcnV3T2NQqxvpg7eQLe4/bF/NjzgONAEimZqgR1qxADcnk JM8rAcH6rna2fqOT+G0MwviRwwZXJBSZEEavwbQ5iTzu+ra0KtkrpMHMhk5nyfZnVmHp TXHE6D+qhm+lsTbS/kIyOe9/xh4IHQFY7k1sswvBwe/RCjdIc1ofRd5Q+FJo+KKmx0Mu aLzg== 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:mime-version :content-transfer-encoding; bh=I2KozgV8LsJ3oghDbBwD7JWJSY8BiOWc0iXvqxoUFxU=; b=FMTD//c2yQWaXvThZKvKsD8a94f3XmPmxKjoMCxHdykGaF0f44CNCouhlNQ/8K4Yuq IjVKmZn9dEzjWIr9yjb1PELYXhbMb6QBvN2rE4GMHMfBzNGQg6Wl9geIK30PC4jkbWlu 11SRjViipLLvclJco4/QwHDp+AaYChrwHf5VQ6yyU+pQk8/MmY3eEsNVMyfYfief+QUY hideGPMR4eTLYe885Zz/rzuyYDCnljPWU/irYnY5pbMqIOCztYzgVcywdeDRx3HF9soq XIO4NvtExR+T21z6WKR14aaW99PODw4hBfY/VjS6EPRJ1ql/SnT+oQ6eFchZE76qS97m gfTw== X-Gm-Message-State: APjAAAU9+z9K5U7mtjouTD+cXoVR9gWL6F6ZM+LHct8V3onvUB2lfjjO wmD5WiGVZEk4vcwRDXH4yGsCLLz0 X-Google-Smtp-Source: APXvYqyKaiVckmeqLhm4A5uLLfj0fZRjJCUJ2v6bbR+sQvDyk+WpxS2XWYNfnCkyBwmEr6bhNWSp+A== X-Received: by 2002:ad4:51cc:: with SMTP id p12mr17102534qvq.113.1579463740947; Sun, 19 Jan 2020 11:55:40 -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 h8sm16075891qtm.51.2020.01.19.11.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2020 11:55:40 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Jan 2020 14:54:02 -0500 Message-Id: <20200119195402.9983-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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 | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 8059e3bb48f..318be0d3379 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -31,10 +31,25 @@ #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 +#define CLIP_MIN_MAX(in, min_val, max_val, name, logctx) \ + do { \ + if ((in) < (min_val)) { \ + av_log((logctx), AV_LOG_WARNING, \ + "Adjusted: " name " (%d)\n", (min_val)); \ + in = min_val; \ + } \ + if ((in) > (max_val)) { \ + av_log((logctx), AV_LOG_WARNING, \ + "Adjusted: " name " (%d)\n", (max_val)); \ + (in) = (max_val); \ + } \ + } while (0) + static inline void v4l2_set_timeperframe(V4L2m2mContext *s, unsigned int num, unsigned int den) { struct v4l2_streamparm parm = { 0 }; @@ -232,8 +247,15 @@ 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) { + CLIP_MIN_MAX(avctx->qmin, qmin, qmax, "qmin", avctx); + qmin = avctx->qmin; + } + + if (avctx->qmax >= 0) { + CLIP_MIN_MAX(avctx->qmax, qmin, qmax, "qmax", avctx); + 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"); @@ -349,6 +371,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", \ @@ -370,6 +398,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", \ };