From patchwork Tue Oct 1 01:11:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51950 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a303:0:b0:48e:c0f8:d0de with SMTP id v3csp95085vqm; Mon, 30 Sep 2024 18:31:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXrfNoJsDyFCUQz2Lt/an0lafJ/PfGw0efqFmyspx1NNqX/xRZAUVwaP/aByotcvgoplvB3TRb1bHkhyQaFIYdR@gmail.com X-Google-Smtp-Source: AGHT+IG+97iG6GpE8ybkRXBbdH4ezfYynRtEptqwM1LbMf8PQcoxixRcFH56x1SimCQIkYSI0hsp X-Received: by 2002:a05:651c:2127:b0:2fa:cdac:8732 with SMTP id 38308e7fff4ca-2facdac8df2mr41535591fa.30.1727746271647; Mon, 30 Sep 2024 18:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727746271; cv=none; d=google.com; s=arc-20240605; b=KpeFEEuLKp0nF2Q9sHFc1kyvSJR/kCfcEbKPiWFnP+jIp4h4vLcmliRZ67WpqFq4Ut 7kBOWiSi8yMLieRW0IiPgjgV4qhV3HmDhrRnRrJBZ3qxOlL3I30ZpSIYi+AWo/Pq3uh5 9jhBp3GLDFiQ6zIsun6u+nGXgTMVHwoyAAq1Z4/DxBPcU5omK0tQVNmdQVJJVK9sFW4j tFAEHjfCJTAZcXB2psWkcE220b/bLXH3NmxUy+9MpML7lzkShn7vatnoXdpzBJgPXat2 AwYD0e4F8JObRcLzWKBVU4qwwz8H1F3zr0bXYy2EKtIIConiMSZVkad4YIxE/1Zw77Hy CMdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=SmDsJJ030ros8/Ec/m78xm2BANNfRNkMcpA7jjucMhU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=W99akZ4rE1TwNCskrDyyJmDM/tG4F5MFblKaonS+DsA9BnjktGqqN4gKRizTWk3sOa 6+vuFcwlxQYFViWfs1wQrUhV38vvp9z4xGI15nlkoHbPnxpFDfy7xeS/kiZUDbE0zDIT r2N+g5BQR9SGyxL3e/kI3dQjXF2lXV69PGy7hKcM24V6igRare7BNi7+2nls4zY2FGZl u+fRdY/zGXQa6UTIzS7CmDmKWLz8tw+FEqkNbvI9lORhfp4OJifyWQ1h8G3v9Ps+zBeY 6+1+Kkw4Su3KVfLyshBe2hWId9osl7WGEPN1oagNSytM9Ky0cdfN6sPiAPyCr7LgFLWz 9zdA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=dm3lTGeA; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a93c29ee608si673388766b.637.2024.09.30.18.31.11; Mon, 30 Sep 2024 18:31:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=dm3lTGeA; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 23C5368D657; Tue, 1 Oct 2024 04:11:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A97668D0FB for ; Tue, 1 Oct 2024 04:11:27 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4D99BE000A for ; Tue, 1 Oct 2024 01:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1727745086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=doGs4THbvCi/mIyx6giu0geNgiJawYOsr3YoaHoLC+s=; b=dm3lTGeA0sDKeUiX4W3Ug3VyczTMWHTdn/AQ3z7xJaa/07Bh7ZBHk1SdD0DPKC1b7wNMgx dKGAuDyMAbxXaSSKTYYTucxwy6B7lpa0wfQf6ofTxIjKH2GoXFKAmU8L6xFtTrqPPbODgN 34A54orDq4ogdAbjVF/HGF3qdAt7a3WqJ/ivuAa7hKmAcx8LNpKbADQqIZcp/fbOzlaJw5 PgSMrfWTxCTl/LxhNN1aaW/4GYRlHsy2bw2WWXXBdfl+DGlGEgj6jbizhvk2zfkg9TkNap VRYc75IFBibPHjLyFqdBO62ue11/V7RQv3dcdOLL1Xv0Mz+WUhNc44m7p9pb1Q== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 1 Oct 2024 03:11:25 +0200 Message-ID: <20241001011125.1446217-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avcodec/ffv1enc: 2Pass mode is not possible with golomb coding X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: o5V6c3EhPyp0 "Fixes" Ticket7063 Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/ffv1enc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index a6f405289eb..3222496daca 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -528,6 +528,11 @@ static av_cold int encode_init(AVCodecContext *avctx) avctx->slices > 1) s->version = FFMAX(s->version, 2); + if ((avctx->flags & (AV_CODEC_FLAG_PASS1 | AV_CODEC_FLAG_PASS2)) && s->ac == AC_GOLOMB_RICE) { + av_log(avctx, AV_LOG_ERROR, "2 Pass mode is not possible with golomb coding\n"); + return AVERROR(EINVAL); + } + // Unspecified level & slices, we choose version 1.2+ to ensure multithreaded decodability if (avctx->slices == 0 && avctx->level < 0 && avctx->width * avctx->height > 720*576) s->version = FFMAX(s->version, 2);