From patchwork Sun Feb 16 19:31:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17798 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 B03C24483C9 for ; Sun, 16 Feb 2020 21:37:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 853F7689BB1; Sun, 16 Feb 2020 21:37:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FBF968809B for ; Sun, 16 Feb 2020 21:37:30 +0200 (EET) Received: by mail-qk1-f194.google.com with SMTP id o28so12916292qkj.9 for ; Sun, 16 Feb 2020 11:37:30 -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=otCF0O0hinHRWQCmvwoq6Hsdv2oHLvwyIDqEoHSBFUs=; b=LNytUGG2RG2HjD0xzN/YDyiunfQeRA8lLbxGt0Fjfuj+WAJPVctdxWMR2rDJana0yE e+wDllyITxsZkLYcRmSq8361v9h0cdN4yqj2l/WD/7p4/u+LKcKDkUIwxrBKVksSZrSv /LwJVPTCwz/fCU0noiCCRALhA5AQWR4A7DkfFGv82KTLjhga5e1+C8NRGr/dKB6CuWlT f6bDOwLEAy2lLSH0byinelHqiWJUtM6jWjrtVEN4uWhpikUsWChQCHmXJSz/KDfWic5W f5hMvqQAEA3D5K0ELAXS1l5aH2gNmkp20PZKePlFYtIfuG3gHkyMLqOLnrx3A1WgOoK3 TSZg== 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=otCF0O0hinHRWQCmvwoq6Hsdv2oHLvwyIDqEoHSBFUs=; b=a+0icCZU4EUI/z4dYIXQFpI9bruTLuXKTEpxNS2CIfMyjnw2EklQ855YfC54hiFr6u uztSHqJQWQlJxorrV+05/Q6/MyVOplsW/YtiGdFM2gxOBjVQpJo0sVoEPbDKI4h1G5UR 6d33j/gcIaT+S7vthVzaJUpXKcAtTzjQIrvBEX6BXgCz2oft+eOJsfrjSVYN4d3ErfoW rSZ4IHRFfJ+mdyBQZBsJV47chGxK13BbPvnVhuQqL7QgQsaXVkq1Kpj9/HprH4O7dRM6 cRGH3LjSxBPyifyok5OD367B9KIaSc6cCDIhHRvowfTQBQFa3soNWFS1angS3Qv1Zr1F +Btg== X-Gm-Message-State: APjAAAWrD0yMqAo5daiGKkbZIrK0OXfquQEImwYkjsFXk8OmkHoassm0 BRbdDg3qaj21IZodqKtpupOiq5OI X-Google-Smtp-Source: APXvYqyrROI0zkrVHnAHbhSW+puUqP5GWXcvOTaNwruV2cwB9FVU+HMQroNVwOh7pE1jiqrIRgZTqQ== X-Received: by 2002:ac8:7b9a:: with SMTP id p26mr10757722qtu.281.1581881515178; Sun, 16 Feb 2020 11:31:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2020 11:31:54 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Feb 2020 14:31:42 -0500 Message-Id: <20200216193144.14169-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/3] avcodec/v4l2_m2m_enc: Enable frame level rate control by default 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 Without this setting, bitrate and qmin/qmax options have no affect on the s5p-mfc hardware encoder. Signed-off-by: Andriy Gelman --- libavcodec/v4l2_m2m_enc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 98b9dfc2c0b..94373b3b6e7 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -177,6 +177,7 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) /* set ext ctrls */ v4l2_set_ext_ctrl(s, MPEG_CID(HEADER_MODE), MPEG_VIDEO(HEADER_MODE_SEPARATE), "header mode"); v4l2_set_ext_ctrl(s, MPEG_CID(BITRATE) , avctx->bit_rate, "bit rate"); + v4l2_set_ext_ctrl(s, MPEG_CID(FRAME_RC_ENABLE), 1, "frame level rate control"); v4l2_set_ext_ctrl(s, MPEG_CID(GOP_SIZE), avctx->gop_size,"gop size"); av_log(avctx, AV_LOG_DEBUG, 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", \ }; From patchwork Sun Feb 16 19:31:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17799 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 D6030448913 for ; Sun, 16 Feb 2020 21:39:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7D16688170; Sun, 16 Feb 2020 21:39:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06CA2687FA2 for ; Sun, 16 Feb 2020 21:39:03 +0200 (EET) Received: by mail-io1-f67.google.com with SMTP id i11so3163931ioi.12 for ; Sun, 16 Feb 2020 11:39:02 -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=hVjvCgb7YxAWZDNQSftC3sofjnT4k8Ee88QPIPbIjiI=; b=abjyqDWrTpNJWdevwjsX2x+MvaRmCuKFlYm8FoyDyuOrH7ueqij4a7Kb8Pid80Q9KD LAGuTbuC6VbTrxAXAsDMX2GhrLzQKGIxETBeEGjGF1Zfy9u045HaHdlJy12dgdCA42DF SM/6qlH57opKpCUzDLm4z4W8PLu2WHyy5fxuqqsk+pijlsJIBF73KYS1fnax0BYB0z1T vADUa2CBDbAD4r2KsjJL3XTiZRkz16i2Y7a6F3hc9gMOBuVVQYvryAyMnD6JzKnxh7xD MwttGnG6IQYdLAPkq8ieRagk7D+62RjUCOC4UmBdr1DkQoqxh3uCWdvrFMr1jITS9pKo amGA== 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=hVjvCgb7YxAWZDNQSftC3sofjnT4k8Ee88QPIPbIjiI=; b=VZWa7HlGcWVCeL+ehntQ6LLTf5qFXl0ejObliMiSlZ/EA8biwRrE0+ug5DnPzdcMO0 2biQImDrvdp6Pvj/w2rykBEG7Qp45KS8T4VeYLBXEOW0Zh228RDU/Ycs54GLN1jOTrSj zNFDXOSReIsEnppJ/5cAyLXTPAA4ReomwTBmXJGaaJc1eR5MyYhyXd5xBdlSL1b+UBbR fUpYJ7yooaOuqdKrq9KEcKS3zeHOF5hfOMYm64kr06lkUPyiAHDVYD46TveLfy7vmDfS VdRUtMqH92pUfrKmYc4a1vcqFJ0O/WXYgqFBBhCvqrBNdaWQvRs0MRLoiUXGYVHX9veU mICg== X-Gm-Message-State: APjAAAWkZJLVUXAIAImdosUANIDf6ksu9Hq6PUn5BogFljg06RW3auhJ SR8bStq8AQ0W1a2N8h/y78l8UONw X-Google-Smtp-Source: APXvYqymhxdloQu3/8baQPQ46OlrH2YLhEMB5wgrv8ceKmbI/dPE8Es6GrLG98/Plgv8q6pANqHUoQ== X-Received: by 2002:aed:2202:: with SMTP id n2mr11130309qtc.4.1581881524043; Sun, 16 Feb 2020 11:32:04 -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.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2020 11:32:03 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Feb 2020 14:31:44 -0500 Message-Id: <20200216193144.14169-3-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 3/3] avcodec/v4l2_m2m: Fix typo in log message and cosmetics 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 Signed-off-by: Andriy Gelman --- libavcodec/v4l2_m2m.c | 4 ++-- libavcodec/v4l2_m2m_enc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c index d0bd4cd3d25..2d21f910bcc 100644 --- a/libavcodec/v4l2_m2m.c +++ b/libavcodec/v4l2_m2m.c @@ -264,8 +264,8 @@ int ff_v4l2_m2m_codec_full_reinit(V4L2m2mContext *s) ret = ff_v4l2_context_set_status(&s->capture, VIDIOC_STREAMOFF); if (ret) { - av_log(log_ctx, AV_LOG_ERROR, "capture VIDIOC_STREAMOFF\n"); - goto error; + av_log(log_ctx, AV_LOG_ERROR, "capture VIDIOC_STREAMOFF\n"); + goto error; } /* release and unmmap the buffers */ diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 5410cffe4a2..819f7e36109 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -84,7 +84,7 @@ static inline int v4l2_get_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed i ret = ioctl(s->fd, VIDIOC_G_EXT_CTRLS, &ctrls); if (ret < 0) { - av_log(s->avctx, AV_LOG_WARNING, "Failed to set %s\n", name); + av_log(s->avctx, AV_LOG_WARNING, "Failed to get %s\n", name); return ret; }