From patchwork Sat Oct 7 00:14:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44186 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp152481pzb; Fri, 6 Oct 2023 17:14:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHi6yhYZj+d0WdOxJuehqh6ZFiS4dC6em/5SlSrivYSGmTMvRNuhTLj52PbJKnF8k5JD2Pw X-Received: by 2002:a17:906:e:b0:9b2:7492:70a0 with SMTP id 14-20020a170906000e00b009b2749270a0mr8042312eja.27.1696637699514; Fri, 06 Oct 2023 17:14:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696637699; cv=none; d=google.com; s=arc-20160816; b=xbj6jfbyZoVUFGf0JkDZSmpFtwEsrc0wklRQIZPe/L9G9MVKrRhsrWrv5MMN8qj6NS 1/11qE9xuudYhW6QErlKSYToi0pzNGc8HMir+fWlQVQmY0aKyHXX199zwq5PYR7xafuE ClcZY1Yzevqrg0fVlxYTscjYXEVLqJUmKrMI/Jit4gPX4Uwd5TUY8TRbAHbhlUMfXdt+ /2UvD7JNVAa26sEzwHtlp3jUZdT7bwTn3tFUoZHSWji8j3lEFf53YdrDEpQ6I61k82Ij uI8qC417kAWLGQMSgn8dmg8YLqd1Q9AMxLFSMHkkQBa/4gnhF5N7N9d/C0XLiWxKuphM 5Zrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=G52AzIfEWhGvaIf74RbIsgcGGFK/b9PJYv+FPNnNxSw=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=GRP330up9zmVRkwjdo6OH2Vs99oQs7aC11ndwnhwia11pXTocmKEtF/hGiHvC4TurB FIRaEekGPAFYA3RKgH+UIdYBDGQDtq6eeCbrFpB114ViRsEGB002MvGNFoUK2t2b4QUu 8vsuE5jpW63yoGbpT7C/0/bnjum9x7SFru+nYvX5B9+DAfkn3yMMI2VJv4eco/bcTI18 Z+EtxiMcldIVC2c9fu//DdzfpOzHMSHNt9cLvvP1bLAmqh4eW9vrdhhp8J3KzuKXT0cd IG/AnS3sh9/IOC4Wi1jhMqAzaZdcc7UWXv4V46BtfhiNdvDg4fOLOo0V/PzyrGBqmj+P rmfQ== ARC-Authentication-Results: i=1; mx.google.com; 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 gf17-20020a170906e21100b0099364d9f0e0si2022695ejb.540.2023.10.06.17.14.58; Fri, 06 Oct 2023 17:14:59 -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; 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 4CA7568CAA7; Sat, 7 Oct 2023 03:14:54 +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 35BBC68C94F for ; Sat, 7 Oct 2023 03:14:46 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B5E73E0002 for ; Sat, 7 Oct 2023 00:14:45 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 7 Oct 2023 02:14:42 +0200 Message-Id: <20231007001444.31861-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/ffv1enc: Slice combination is unsupported 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wzLRR73CTApr We always write minimal slices, the size calculation is wrong in some corner cases but as its always 1x1 (minus1) we can for now just hard-code it This helps with ticket 5548 Signed-off-by: Michael Niedermayer --- libavcodec/ffv1enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 2778c63012e..4d0ddc167ae 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -914,8 +914,8 @@ static void encode_slice_header(FFV1Context *f, FFV1Context *fs) put_symbol(c, state, (fs->slice_x +1)*f->num_h_slices / f->width , 0); put_symbol(c, state, (fs->slice_y +1)*f->num_v_slices / f->height , 0); - put_symbol(c, state, (fs->slice_width +1)*f->num_h_slices / f->width -1, 0); - put_symbol(c, state, (fs->slice_height+1)*f->num_v_slices / f->height-1, 0); + put_symbol(c, state, 0, 0); + put_symbol(c, state, 0, 0); for (j=0; jplane_count; j++) { put_symbol(c, state, f->plane[j].quant_table_index, 0); av_assert0(f->plane[j].quant_table_index == f->context_model);