From patchwork Tue Oct 1 20:31: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: 51979 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp547418vqv; Tue, 1 Oct 2024 13:31:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUJpDvHCZ8hCrLLtwJabNDv5NLJbbUoE4rIqSGFUCjFRKHznIHndlupq8fnMzbP+7POQIZykYVn6xqntxat1kb9@gmail.com X-Google-Smtp-Source: AGHT+IH8QOTcH1H5Pf8CdgCFX5537N5VwsSVRUc6C52A1N0zS0Am5wPrHp6YJVLc54u3MDuUCq6q X-Received: by 2002:a2e:a106:0:b0:2f7:9e1d:f6e7 with SMTP id 38308e7fff4ca-2fad866c539mr16416491fa.9.1727814711275; Tue, 01 Oct 2024 13:31:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727814711; cv=none; d=google.com; s=arc-20240605; b=gV+xwXU6gHKOGE0dLwSpHCYC3V35wNbHk9jyBHu9WVphlHFqhuvftOhdsYBrR4kPB1 wylL7/AKfzZTZqs5iQqWLJUTcpivasFK/Vtv/XfdYWF3Ie98xeSR9tWjXcEoPmLBairH DnTbyy2qDLOFC/DZf49IWZOUGuAIEHKncYlFINVUCirek/t4tQ6mNtZ2csB3VifhBaUn JAkBFzFR6trKNVje4yBQg1yZzjI/LeqMw7whcquySgqom/LQd6xlsZFgmrGWmvM6gVWM Q+MHdDyeJSL4zuT5oq4m2JZYzpR4ehHDyH+klag9AYB7kBX4VfdBTzNoWGDz3Vz+6Onp OMOA== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=gbWAudAmAOAay8FcLOTxDzBSXyilRCClCKKRvf9W9rs=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=PzdoFSGECb8GAPNBbmPco9PKesEYjgw7OYq1cZVcDTqG7b59hChHbKGpItV6Y4QCBm a1w5PW1tzzw+Sd0NvX7VgfWnPr/+8kXLyRkNjuVP5h0uCWH7x4GwD5OpqxF4B7uBIsbx xg/IVzctWcVIsd6leDA8oFsFYjiZceQxvOVrK6Kq1eP92F5YXPpykE8KfH1g+064Yw7W +k9kAqxKeZhB/UFIxiCeo8vHa2Mjbq/HGhM3l2OwYbcSzY2T7wPwQXIfsI2Dlbl/W0zx q+mLeq8HQWvlMFhvfBg04oieoNBq8LGi6jlgyLMlKqgAZ9WS8D8hmlHT8QWFm3q+gwpq Mg0Q==; 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=azkIIkMa; 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 38308e7fff4ca-2fad3a51a4bsi12043231fa.128.2024.10.01.13.31.50; Tue, 01 Oct 2024 13:31:51 -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=azkIIkMa; 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 891CE68DA2C; Tue, 1 Oct 2024 23:31:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B722D68D73B for ; Tue, 1 Oct 2024 23:31:29 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E995A240002 for ; Tue, 1 Oct 2024 20:31:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1727814689; 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: in-reply-to:in-reply-to:references:references; bh=AnfNl3PSo0+g7wyYQq/frT089bZ9O7O3KQVmmaWnfZ8=; b=azkIIkMaYH40WjryuyscVad3vdqNYcV8iwPd9a9wdsYEoV5F1JMFvkiRVc3v8fHrvCcJKq pJG98luthmYrWTUrkD1j04ocpMGjuDvfi1GadCv0s3zVROP+2Cwu9yFXWkZyzy7H5Rw7GN FPo47dB19X0E9qJudDTn61xyfluyfKCjPCKJs5xCccaueb+yjg2QJzXKvx1dbQrwFO8lZo e9NJmHwcP+Nm23ZAevWV+0WPg9y8JG8SI0oEnYKXiPGT4Zj82zy1g1S9otDKtJOTuxZyil YFViac4R4Rn0CBFmtOciETaZMeW56svOpBoK8OSYkioHTwzGrloxJYv4n0RshA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 1 Oct 2024 22:31:25 +0200 Message-ID: <20241001203126.1656651-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241001203126.1656651-1-michael@niedermayer.cc> References: <20241001203126.1656651-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/ffv1enc: Prevent generation of files with broken slices 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: Bw8Owa+9nH/4 Fixes: Ticket5548 Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/ffv1.c | 7 +++++++ libavcodec/ffv1.h | 1 + libavcodec/ffv1enc.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 56a36e479fc..2b8564c2f56 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -119,6 +119,13 @@ av_cold int ff_ffv1_init_slices_state(FFV1Context *f) return 0; } +int ff_need_new_slices(int width, int num_h_slices, int chroma_shift) { + int mpw = 1<num_h_slices * f->num_v_slices; diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index a35197964e4..e19c0df0142 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -171,6 +171,7 @@ PlaneContext *ff_ffv1_planes_alloc(void); int ff_ffv1_allocate_initial_states(FFV1Context *f); void ff_ffv1_clear_slice_state(const FFV1Context *f, FFV1SliceContext *sc); int ff_ffv1_close(AVCodecContext *avctx); +int ff_need_new_slices(int width, int num_h_slices, int chroma_shift); static av_always_inline int fold(int diff, int bits) { diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 94d9830e07b..56af7dc4274 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -865,6 +865,10 @@ static av_cold int encode_init(AVCodecContext *avctx) continue; if (maxw * maxh * (int64_t)(s->bits_per_raw_sample+1) * plane_count > 8<<24) continue; + if (s->version < 4) + if ( ff_need_new_slices(avctx->width , s->num_h_slices, s->chroma_h_shift) + ||ff_need_new_slices(avctx->height, s->num_v_slices, s->chroma_v_shift)) + continue; if (avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= MAX_SLICES || !avctx->slices) goto slices_ok; }