From patchwork Mon Nov 11 14:16:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 16210 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 EBC8444A87C for ; Mon, 11 Nov 2019 16:16:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C681A68A879; Mon, 11 Nov 2019 16:16:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4570D689BC2 for ; Mon, 11 Nov 2019 16:16:33 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id f2so14764397wrs.11 for ; Mon, 11 Nov 2019 06:16:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=iZ0H3vxDABW1UN+1EJECgSiRLpZJDakxTW1UZH0Oc2M=; b=AWbLoDA3dNYdL7EfsTxJT8ZPYO/uNTTPRBouHL+qzeXCOAi6oSS+JdpWaZ58l4SGx5 O8KQ5usfztb07lwGpuH3EfRCbwMXere0Gbm8urckwaZWL/5SYUedHsjlwaCWhpNmeUIx e1s4df+cLFmTYX/wPhD9W7htq7Bm/IfjZr2X6FQ0khCk/fXwnaOF48GbvRz/FyGkydTV O7JqglyUAFw5MZDPkvIA/XoJ4Yse5XUfD9rXeXFoZnH7G7CtmCunw+PDuOW4Ptoy2tpl 9aY5mo6bGM8aT4k0IAv+W6sDsKElrDMNqKQavcAluANYCCPdeENwlqU4l3Jj9S0VLVq4 ulAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=iZ0H3vxDABW1UN+1EJECgSiRLpZJDakxTW1UZH0Oc2M=; b=anyrbS15CNbGMNSHINYeJ7Vr92NtQ8e2Wlx7seIo/KJLi5Fcs1dMyU+fuBhtbQTYXB sk04/VRq2ycOwgVo7BJNe+DaJpW++vPRy46ZNQHlxQZHSTuMVQJifb9VJG5+nNPLulLT 2mQPCbZVI8alofJ8Ty6q3QpLTI3tz7jyUW9lKVOi5NnI76VGoexd78uTAmsX+oojFgHA wJZD9AL2Dn6Z7YjFwtlKKhBZfQpAnW5j0DZGBtZ/3TtufOQsjxZEUJXIQPwyIvFVuGau 2aXQy3dw3qc0uvH/SY7epbxDKLK8gY/Vwd+CO3QxVWJJo9NPnreqEC7M4j7sJctOSBGT gRUg== X-Gm-Message-State: APjAAAVrGGwm+9Z/MgcrvrVJF/Jm2tkZSDuRol9WefYqcUV/m+keeP0m K3PJSqSBOa3/Ya+QMW4mpEiLxkAV X-Google-Smtp-Source: APXvYqyYYmo37CRjni/TNqu87rtEaGO/FWQtpm4oHTY+r4eOkqjtdBU9DqsDmYEqllq54ucUrD04KQ== X-Received: by 2002:adf:e5c5:: with SMTP id a5mr21981266wrn.103.1573481792509; Mon, 11 Nov 2019 06:16:32 -0800 (PST) Received: from localhost.localdomain ([82.129.88.112]) by smtp.gmail.com with ESMTPSA id r2sm5445139wrp.64.2019.11.11.06.16.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 06:16:31 -0800 (PST) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Nov 2019 14:16:24 +0000 Message-Id: <20191111141624.26287-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] librav1e: Don't make users explicitly set -qp -1 to use bit rate mode 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Derek Buitenhuis --- libavcodec/librav1e.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index 5052cac896..11c1d09e36 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -329,6 +329,10 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx) } } + /* We can't easily represent this behavior with AVOptions, so do it here. */ + if (!avctx->bit_rate && ctx->quantizer < 0) + ctx->quantizer = 100; + if (avctx->bit_rate && ctx->quantizer < 0) { int max_quantizer = avctx->qmax >= 0 ? avctx->qmax : 255; @@ -533,7 +537,7 @@ retry: #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - { "qp", "use constant quantizer mode", OFFSET(quantizer), AV_OPT_TYPE_INT, { .i64 = 100 }, -1, 255, VE }, + { "qp", "use constant quantizer mode (defaults to 100 if no bit rate is set)", OFFSET(quantizer), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 255, VE }, { "speed", "what speed preset to use", OFFSET(speed), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 10, VE }, { "tiles", "number of tiles encode with", OFFSET(tiles), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE }, { "tile-rows", "number of tiles rows to encode with", OFFSET(tile_rows), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE },