From patchwork Sun Jan 19 08:11:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17420 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 DA79E44A764 for ; Sun, 19 Jan 2020 11:54:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B8C6968B0DE; Sun, 19 Jan 2020 11:54:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F23D868B0A1 for ; Sun, 19 Jan 2020 11:54:37 +0200 (EET) Received: by mail-pj1-f68.google.com with SMTP id n96so5302283pjc.3 for ; Sun, 19 Jan 2020 01:54:37 -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=RhFXTVFBwI55wmi7CO6Td/GMQCGpvt+lXvEGTmZj0VY=; b=vYxDF2Rm+8xqYmmziPLywrGLww/9ZSBOafzpqU1082yM3UG7JNjGBDkxxOhSsvnglD 7y7nT0jD2rRE34Es2Re/dDYhRcPW/aFJNiZByleWOgdSmev12t1Y7Ymm12DI4+tL1hD2 kk8CAESAfFzwtVPot56iXwkBuKThHi02TlzhTrXRZikqvvXkHWwQJi3Q/ChMj9QsT24O 130EwR40ulrLqSDeRVx6NbVOxHzItvTdHMK6YMYvkTvVn4IFmLUvN+qEkUwpEPbnPXHu 07YgIK2WdLgk4Dp9okSQn2F+ADMo7K/tQxY3jLgvkjQt2QIZQNUSyGrXWh9z5KIx99J6 ym6w== 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=RhFXTVFBwI55wmi7CO6Td/GMQCGpvt+lXvEGTmZj0VY=; b=Kc9JARQNU+qqKtx63TBvLzQKbnRoXrkgDWDc1WboUvw+VZR85lMSt9Jc+P11wNZQdl o+kesP7ECMSTqCz1dwnY2scT3fV3cuYpqVVdTFgjtTebfINA1XKheIHtpXTvGBisxJ1W cx0hLZEuePOFLAqdBpnC5TCOOwwWLWOg70MIglY/dXt+lclDc1/B8imm0c8zXW9StV3u Gh02cgVRxFEG/dOq9elnIe057x77KWIQPJ5JW7/pcK2UnJ+hzgi9GyfZEZKWhioQrXNT 9q1q/L+DzekusZUCe7XSkd+yVWd5mUTMqxurzMz/ltXdNr5SemxLmOp2FfERHh7TVGYU aNRg== X-Gm-Message-State: APjAAAUKMrDujwVDRzK+UWvzCObMYkG+4AIPen1oq8WDPuhT2OXUWvLM +1yEhmd58kyZN5usxQPgq6DkuUM7 X-Google-Smtp-Source: APXvYqwVEG1kMael6TDUVWtp0GfdmHjVg3EjoGQh85Rq9gk0AUI5JhCHLIhpMmXnyEhrQnLl0dsmtA== X-Received: by 2002:a05:6214:433:: with SMTP id a19mr15553816qvy.221.1579421534322; Sun, 19 Jan 2020 00:12:14 -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 z6sm13906879qkz.101.2020.01.19.00.12.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2020 00:12:13 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Jan 2020 03:11:46 -0500 Message-Id: <20200119081146.11669-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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/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 8059e3bb48f..b61d48316ee 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 @@ -232,8 +233,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"); @@ -349,6 +353,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 +380,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", \ };