From patchwork Sun Feb 23 18:47:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17873 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 555B944A6E0 for ; Sun, 23 Feb 2020 20:47:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F21368B47C; Sun, 23 Feb 2020 20:47:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70E9168B06A for ; Sun, 23 Feb 2020 20:47:41 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id h4so6891649qkm.0 for ; Sun, 23 Feb 2020 10:47:41 -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=YBANLBgYiq59Wyk/spHPwB2iP6Q82vP1ZCWRialeRoY=; b=arCHrIwxK9LTCPEgdvsKWJGC7g18dZPyVyL+W0nnrOVV8mIL/GebDiW5rtz5qB/mra l9V9gm1Iu3LVtl2EPKLmqidexXsqWHTkpB9ECbRnSQX/h0rLmjEd+l91DQrx1qYvOhLs eEVn8ncK1nphuesCV/GywWoDXjAT5ZUovyrdVtjWO3CSSN6cTSQcnw9XostWg4aOQmrW TbQroPmdeYvIUCm2Vx522iFi1zCBGxJ16qhWcYQLekcMCHfAWFT+Vt9pL9Bmm0zUmXIn s2nc3V4bTQqrhiP67EZFB9Bd57tTzFfEqG09NQvsx2Uzb53L6kVqGgFwDcpuFE2DCDDz wTLA== 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=YBANLBgYiq59Wyk/spHPwB2iP6Q82vP1ZCWRialeRoY=; b=dZ+nIT97ZkFVy2+zYuT9Efk+Gb7Awifq6cPjRzMWPgRyXTL1kN1XjCcoVEohOHDIjD 5EwAp+LcPNh3/nIf2ZMdAmadQF3UQWeYYz6T9uaoExa70hUUvF6s+2kx+0V0hrbTUwB7 kUgpmTAiPP31MuoNwpEVvGdu3blgsmnjxFpsdB8+C7OWWYlip/93TWquL/6dN9LAEnrD f+/+04VRcyKDI/VkjMM1OEXn6XkPEa8vs8wPoYLGp/q9nCPC1lgO6dcKUZhO56TjsSze CT5Hi3zlXQx0Z/VKyAefyfLjDrwKmwNIMEBv5ZT7jFBWOFjCk8mzZCpga6xRMsYqc0ah 0PPA== X-Gm-Message-State: APjAAAWh2MYeyiHVCnPdwWNWpNt7nkXtkUVJSYdX9h83iFbtAIYy5fQb wXh8Cdi2vJ+abr1I8LBCekaH8chQ X-Google-Smtp-Source: APXvYqwGDmqM4LYIQ41HM5fMfzNsY5tnLXhZ7o6qHnusqE6O99U1bR0q3/gSmwJZdo/4feAuFwNOfw== X-Received: by 2002:a37:5943:: with SMTP id n64mr5735521qkb.411.1582483659763; Sun, 23 Feb 2020 10:47:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2020 10:47:38 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2020 13:47:31 -0500 Message-Id: <20200223184733.13113-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/3] avcodec/v4l2_m2m_enc: Reduce log verbosity for some params 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 Currently the user gets unhelpful warnings when some default parameters are not supported by the device. The verbosity of these log messages has been changed to AV_LOG_DEBUG. Signed-off-by: Andriy Gelman --- libavcodec/v4l2_m2m_enc.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index c9f1741bfd0..859feb7bde7 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -47,7 +47,7 @@ static inline void v4l2_set_timeperframe(V4L2m2mContext *s, unsigned int num, un av_log(s->avctx, AV_LOG_WARNING, "Failed to set timeperframe"); } -static inline void v4l2_set_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed int value, const char *name) +static inline void v4l2_set_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed int value, const char *name, int log_warning) { struct v4l2_ext_controls ctrls = { { 0 } }; struct v4l2_ext_control ctrl = { 0 }; @@ -62,12 +62,13 @@ static inline void v4l2_set_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed ctrl.id = id; if (ioctl(s->fd, VIDIOC_S_EXT_CTRLS, &ctrls) < 0) - av_log(s->avctx, AV_LOG_WARNING, "Failed to set %s: %s\n", name, strerror(errno)); + av_log(s->avctx, log_warning || errno != EINVAL ? AV_LOG_WARNING : AV_LOG_DEBUG, + "Failed to set %s: %s\n", name, strerror(errno)); else av_log(s->avctx, AV_LOG_DEBUG, "Encoder: %s = %d\n", name, value); } -static inline int v4l2_get_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed int *value, const char *name) +static inline int v4l2_get_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed int *value, const char *name, int log_warning) { struct v4l2_ext_controls ctrls = { { 0 } }; struct v4l2_ext_control ctrl = { 0 }; @@ -83,7 +84,8 @@ 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 get %s\n", name); + av_log(s->avctx, log_warning || errno != EINVAL ? AV_LOG_WARNING : AV_LOG_DEBUG, + "Failed to get %s\n", name); return ret; } @@ -145,8 +147,8 @@ static int v4l2_check_b_frame_support(V4L2m2mContext *s) if (s->avctx->max_b_frames) av_log(s->avctx, AV_LOG_WARNING, "Encoder does not support b-frames yet\n"); - v4l2_set_ext_ctrl(s, MPEG_CID(B_FRAMES), 0, "number of B-frames"); - v4l2_get_ext_ctrl(s, MPEG_CID(B_FRAMES), &s->avctx->max_b_frames, "number of B-frames"); + v4l2_set_ext_ctrl(s, MPEG_CID(B_FRAMES), 0, "number of B-frames", 0); + v4l2_get_ext_ctrl(s, MPEG_CID(B_FRAMES), &s->avctx->max_b_frames, "number of B-frames", 0); if (s->avctx->max_b_frames == 0) return 0; @@ -175,9 +177,9 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) v4l2_set_timeperframe(s, avctx->framerate.num, avctx->framerate.den); /* 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(GOP_SIZE), avctx->gop_size,"gop size"); + v4l2_set_ext_ctrl(s, MPEG_CID(HEADER_MODE), MPEG_VIDEO(HEADER_MODE_SEPARATE), "header mode", 0); + v4l2_set_ext_ctrl(s, MPEG_CID(BITRATE) , avctx->bit_rate, "bit rate", 1); + v4l2_set_ext_ctrl(s, MPEG_CID(GOP_SIZE), avctx->gop_size,"gop size", 1); av_log(avctx, AV_LOG_DEBUG, "Encoder Context: id (%d), profile (%d), frame rate(%d/%d), number b-frames (%d), " @@ -187,26 +189,30 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) switch (avctx->codec_id) { case AV_CODEC_ID_H264: + if (avctx->profile != FF_PROFILE_UNKNOWN) { val = v4l2_h264_profile_from_ff(avctx->profile); if (val < 0) av_log(avctx, AV_LOG_WARNING, "h264 profile not found\n"); else - v4l2_set_ext_ctrl(s, MPEG_CID(H264_PROFILE), val, "h264 profile"); + v4l2_set_ext_ctrl(s, MPEG_CID(H264_PROFILE), val, "h264 profile", 1); + } qmin_cid = MPEG_CID(H264_MIN_QP); qmax_cid = MPEG_CID(H264_MAX_QP); qmin = 0; qmax = 51; break; case AV_CODEC_ID_MPEG4: + if (avctx->profile != FF_PROFILE_UNKNOWN) { val = v4l2_mpeg4_profile_from_ff(avctx->profile); if (val < 0) av_log(avctx, AV_LOG_WARNING, "mpeg4 profile not found\n"); else - v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_PROFILE), val, "mpeg4 profile"); + v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_PROFILE), val, "mpeg4 profile", 1); + } qmin_cid = MPEG_CID(MPEG4_MIN_QP); qmax_cid = MPEG_CID(MPEG4_MAX_QP); if (avctx->flags & AV_CODEC_FLAG_QPEL) - v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_QPEL), 1, "qpel"); + v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_QPEL), 1, "qpel", 1); qmin = 1; qmax = 31; break; @@ -235,8 +241,8 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) if (qmin != avctx->qmin || qmax != avctx->qmax) av_log(avctx, AV_LOG_WARNING, "Encoder adjusted: qmin (%d), qmax (%d)\n", qmin, 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"); + 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); return 0; } @@ -248,7 +254,7 @@ static int v4l2_send_frame(AVCodecContext *avctx, const AVFrame *frame) #ifdef V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME if (frame && frame->pict_type == AV_PICTURE_TYPE_I) - v4l2_set_ext_ctrl(s, MPEG_CID(FORCE_KEY_FRAME), 0, "force key frame"); + v4l2_set_ext_ctrl(s, MPEG_CID(FORCE_KEY_FRAME), 0, "force key frame", 1); #endif return ff_v4l2_context_enqueue_frame(output, frame); From patchwork Sun Feb 23 18:47:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17875 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 29B3244A299 for ; Sun, 23 Feb 2020 20:55:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 017CA68B480; Sun, 23 Feb 2020 20:55:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 487E768AA9A for ; Sun, 23 Feb 2020 20:54:57 +0200 (EET) Received: by mail-qk1-f195.google.com with SMTP id f3so3923564qkh.3 for ; Sun, 23 Feb 2020 10:54:57 -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=9+GNCfEkOvY8TPatEjcy+ajO1Z/EMWMY6Hujjvi6NZY=; b=nUOWt+kCONfCdslpd8Sg5YEV0/zghyYQMcwhezGviLawnjDsCZLTnrj/A1P5AUtvPn o2+9y2Tcs4NnlKrseNy8uvQIrMgbNAVX8uXLORzf2YSQzhTPa9N8x4xnMeBofoxxWcPr DpZoxlAElPRVcVGBNlbKH2LN10VXMBYueH+WTvGsAtRAJwNwbWh6F3dJyhOaZuWIPhKG 9T6E3yzG6vMkpMIVMDQ6BX+k9NWlsbxfW1z1HRfPH1jh+gMdSe0Z6vdhvG1QOclz+x1q zf8AT+IhWsWnNZuwcubsEHLCtkHbMIaX84alRQpqY/KYOrhOssRCGi8aWqg9P9UOen++ 2MoQ== 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=9+GNCfEkOvY8TPatEjcy+ajO1Z/EMWMY6Hujjvi6NZY=; b=m9sxLaFvBNJMpJqRznlDZ21dEQuNXSk/GeefbQiVz35WEJwvuOCT+BsUfMlZMQ8jc4 oMKeAUyaNNIpKqWRdF9OKFswPZmTKr5d927/OHLPO1kVz+nnVtSqKfRoq9FwX5ncLvBf OpFTYTjwtH//BYZpqUFISoFonkNKasi+GDUPN5Fa+YEcH+DandwWmmsEtIXp+Xei64pU sME6msEpa8++SbINCW9Fjm49FTOfSEeRNdkJ+yzO6JXr8Es1hUWBMEPC308nQZWedE1f OLkcAPzc48BOrmg8RjpSOD8PNUAxyjPTOr3Crk5dbXvlxGkCIW6MR15z9cwJUvnqWaKq PdiA== X-Gm-Message-State: APjAAAV5DsY0Mrptwnjhbjy1jYIOQ2UjTtsmfflcmHVCl+ooT280yiO1 qGPSPvungLOMr632qRRbyJd8cOH7 X-Google-Smtp-Source: APXvYqyedyDlHn5vh0DgYVN2f0veHYAXCM14fwu9iyKhso8E57q3UUGEzlOYxI8UkggErlPnZ3nyrA== X-Received: by 2002:aed:2ce4:: with SMTP id g91mr43200745qtd.352.1582483662951; Sun, 23 Feb 2020 10:47:42 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2020 10:47:42 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2020 13:47:32 -0500 Message-Id: <20200223184733.13113-2-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 2/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 859feb7bde7..0098d5314bb 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -179,6 +179,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", 0); v4l2_set_ext_ctrl(s, MPEG_CID(BITRATE) , avctx->bit_rate, "bit rate", 1); + v4l2_set_ext_ctrl(s, MPEG_CID(FRAME_RC_ENABLE), 1, "frame level rate control", 0); v4l2_set_ext_ctrl(s, MPEG_CID(GOP_SIZE), avctx->gop_size,"gop size", 1); av_log(avctx, AV_LOG_DEBUG, 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", \ };