From patchwork Tue Apr 28 17:06:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 19346 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 AA48B44BA76 for ; Tue, 28 Apr 2020 21:13:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 803FB68C42F; Tue, 28 Apr 2020 21:13:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 842FE68BEAA for ; Tue, 28 Apr 2020 21:13:40 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id g74so22727524qke.13 for ; Tue, 28 Apr 2020 11:13:40 -0700 (PDT) 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=zq31SM45pZ0NX3O/i/w0w+eoAUAZbfwYXHEvxrcRERk=; b=ta7HA+mxA0PYLfQ58T1dqnA6Ut7OAZHnfpNQcRfHktMQikliPuXKI54wUhE6JaWehi 5+JhhjKjBgoYsyHwHRQRT0MNh0azs25S2ptTzZxVmh/M6VG5CIfsyWoU54IznlEs08rQ DW5rj0ba7k45/JCDbBpd/CxiwDw6XmvgBMmX5FgpZfNwa66Ht37mmelm1ZRw5y737Hwz GfGwpGM17ki/S0I96/fa5iXdmRhmCkN+tH/ihgRtjs5CTNRHC2L4GPZW/GOg3IS67Boq Y1V86qodegWHl0tK7jBBcMSvgoZwqz8Zp+5Czd8OV34tz0CtiQlpv//b3R7cVyi0w5RR d58g== 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=zq31SM45pZ0NX3O/i/w0w+eoAUAZbfwYXHEvxrcRERk=; b=gSqg/NavnbLSYZ64sMr9V9Uuhl39fzC5wBOqwJ0/RUmewYd76x8wzLslCREliLizKK ZdHrkY6l6+fjo/rgnsitAdUOvSeLbT99+dnKY5jS7PR+X216GxwGaAJmZRIYr4fR/m6I 2r2c8awP0rhCqNYELBMhH4LHCeiF/4g9pyAOXf+IkVC7zYhbkM59Gv/Jj/0IltIXyDD4 ov0Hd2GMWnJOcXvaZc2GGY7daFt1OS3GSI2pjR1uS/kYH1lNcGlsy9EASjNuNkyWQoj0 rgtdfcUlXfQrwn4LFGLYsK6GlzB1j7q1ZM4mgtebDqRIvEDjB9hdHdTQUw/P69iv16J5 3MMg== X-Gm-Message-State: AGi0PuY5wD4GfFWqUgVHq4CUvmpGl6T74XRNKLhwi3H1iCakoTXYN68e 4OGKEJjmwe/2djXEfQkdUx04AXeY X-Google-Smtp-Source: APiQypJBGx3hJH4MCiwaY2cRTdxMHNJvrfPsFWlFdoZzz8eRzOEbNzFaRXoD5SJb9lKyFI053ivyZA== X-Received: by 2002:ac8:4987:: with SMTP id f7mr28961188qtq.160.1588093610394; Tue, 28 Apr 2020 10:06:50 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id x24sm14507735qth.80.2020.04.28.10.06.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 10:06:49 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Apr 2020 13:06:36 -0400 Message-Id: <20200428170636.3624-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5] 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 --- Changes in v5: - Check that qmin does not exceed qmax (thanks for feedback from Ming Qian) libavcodec/v4l2_m2m_enc.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 8454e2326c..b22cfc61fb 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 @@ -252,11 +253,18 @@ 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 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) { + av_log(avctx, AV_LOG_WARNING, "Invalid qmin:%d qmax:%d. qmin should not " + "exceed qmax\n", avctx->qmin, avctx->qmax); + } else { + qmin = avctx->qmin >= 0 ? avctx->qmin : qmin; + qmax = avctx->qmax >= 0 ? avctx->qmax : qmax; + } - 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); + 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; } @@ -369,6 +377,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", \ @@ -390,6 +404,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", \ };