From patchwork Sat May 2 13:11:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 19432 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 659C844A5F3 for ; Sat, 2 May 2020 16:12:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CB9868C43D; Sat, 2 May 2020 16:12:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E0F168B7B2 for ; Sat, 2 May 2020 16:12:25 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id o27so9843760wra.12 for ; Sat, 02 May 2020 06:12:25 -0700 (PDT) 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=jeSoXBdAwAw095+17ZJsj/yY6H6QbuchkHL+I04KANk=; b=NHEsSGUU50loe4hRKhYGcoI24gdRznwTKD9eICMqFEoRV0Msr7KokPq9dJdhqUpl7D gORps//gGD1OXvkNTIl4AfayFLPgJE+ZGiqEY3XBJQdq1yEr2Iu4K8foxb6MiU/KSwlk 8LvF6hjsWY2T0bDRNP8rMXorabgiMQsRPFr4dzwBVPILxGleiwTqBSLMqyl+XCkRl020 e+WeOGxQkv73v2oCLwB2c33dhFaSqlMHnfGjasSHGsPYWF4v4urzOqwmw2cTpgsfv6pk M0/kk3H3KLb28O8lcBYeHCfipWljqFeRAB/4qxoe8+X5V2W/3R0yhFdjqQmgnprkKpwX bzaA== 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=jeSoXBdAwAw095+17ZJsj/yY6H6QbuchkHL+I04KANk=; b=aYTVD8qVLFOejs43Wr4cBNsTwsVtA+uOPOy9fzl+dTh1/LIB/80PBStmG51s04q24N w7gzem/09q0sP2KKZklhF9dVPNwSXcx5DcnNlkf7FNT+3s+jCIAIwYCqwUcl3JZYrYyy VjwMdtb1PnHhHaFimi0gYv9uSAcWO01Paevet4L+7bzsjE0w/rn2LGUzcxpFj9UDRjI6 lJ9/+bSKAMFwYIHYTjlCpCUyrZI6r75xrQDknJPf2wnNzKY7F6zMnpet8IPLcJpKONq3 6uYfRayjiprAkNHFdnrfOXVbj/NO8Ae5S0ZG7xUSVQAQyCseFMXARvOGsIE4MRGFK5n7 SKZQ== X-Gm-Message-State: AGi0PuaJJijG4hiZOqzhkbQQimvgq6wNRQYMmPQFo3ePqrzauhPkVyVR DbVMPTX6IpNuacRltqFaZ4DMwOih X-Google-Smtp-Source: APiQypJYt9Scxu3axNabgkKqfFgt5UfN5UxHGhYxE/QdIn4/sn+nuSCrVgn9Tpss5tbuENtEM942bA== X-Received: by 2002:a5d:4ed1:: with SMTP id s17mr9011408wrv.310.1588425130518; Sat, 02 May 2020 06:12:10 -0700 (PDT) Received: from localhost.localdomain ([82.129.83.65]) by smtp.gmail.com with ESMTPSA id m15sm4086402wmc.35.2020.05.02.06.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2020 06:12:09 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 May 2020 14:11:59 +0100 Message-Id: <20200502131159.28589-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/librav1e: Require a bitrate to be set when using 2-pass 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" Not requiring this leads to unexpected result, since Rav1e's current two pass API has no way to fail in such a case. Signed-off-by: Derek Buitenhuis --- libavcodec/librav1e.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index b0ff60d8c7..6f9b4cce4c 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -202,6 +202,12 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx) }); } + if ((avctx->flags & AV_CODEC_FLAG_PASS1 || avctx->flags & AV_CODEC_FLAG_PASS2) && !avctx->bit_rate) { + av_log(avctx, AV_LOG_ERROR, "A bitrate must be set to use two pass mode.\n"); + ret = AVERROR_INVALIDDATA; + goto end; + } + if (avctx->flags & AV_CODEC_FLAG_PASS2) { if (!avctx->stats_in) { av_log(avctx, AV_LOG_ERROR, "No stats file provided for second pass.\n");