From patchwork Sat May 8 11:13:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27695 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1323851iof; Sat, 8 May 2021 04:13:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtCboHGrcjrIvn2APQu/WYkUWAsXaEN4Mp7TpSro98jp2oKwy9mE12zKCfQeR8lYZ+L4xQ X-Received: by 2002:a17:906:590b:: with SMTP id h11mr15193444ejq.147.1620472413781; Sat, 08 May 2021 04:13:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620472413; cv=none; d=google.com; s=arc-20160816; b=VwlbLlxjZLbqCyU/b3647EbS66kPf41Y+Sv60Uwc5zzDnxWrw7e/H7664HPLcQwaHd mgICV0FAToppe4Uv4yo1BFnllRY5PIb3+G9orIa/6L/75XAxGQwdsHSZJITDkVbsMTJm EWEFQum5br4imc2USds122lpesu+f5YiP8Em/oyHPt+A4Y3UHQSyaVY1i6YmrjUlFLc7 Xmqzgbk5tREadbYuq82I0spOf5FFkC9y3mWVSeLHeY2z9PdO6kYXzsZ5sbreZKzyByYi AjI8qdAalMjksBRxnbHYuXl3MNGhWk2oRAda1n29ghh1g1wmG9Ldhz+RalaC70PJxsrn no9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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 :delivered-to; bh=3hDSjF6GvGtUQtCTqzOg028YUERvW1foQO1rcji5Shc=; b=cT/3c6QyTDofLbS05nlHHqMdKU0fScDv1C2ZXLKSyvBa+7ZGpyKbhJIm1wjJRVtpN0 J46ErwtnYrVENfCuW09vgQOV9xdfM5MxLuS5d+2wWg5RXju4Nc7a1DSUKOvYIHlUPppZ djfj2tAIxmgfnAc6TtabhenXytHk6lcx1ox/cJkaAvBaqpxSQRcC8d7JtKFyC8vOPdAQ V0VBib1BBqcR2CtteSHUKNM26VIgc2RWS1cw88l+ZDcESECQbroTZ0BimKpw17jwnAUN rycGjv5xzRjqYBbrmKTOtouEJWujU6b5Z6jlWixZTmfknt78lT4mpE+LLQ4/cSquYAxw 6SuA== 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 ke10si7593152ejc.625.2021.05.08.04.13.33; Sat, 08 May 2021 04:13:33 -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 B08CA6808A1; Sat, 8 May 2021 14:13:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 459C26802A3 for ; Sat, 8 May 2021 14:13:23 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 7A8DD240477 for ; Sat, 8 May 2021 13:13:22 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id FFdkuMTOJtOM for ; Sat, 8 May 2021 13:13:22 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:2bd:e41:185e:6294]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 025D324042A for ; Sat, 8 May 2021 13:13:22 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 36F983A1203; Sat, 8 May 2021 13:13:19 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 May 2021 13:13:02 +0200 Message-Id: <20210508111303.27757-1-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/pngdec: fix updating reference frames for APNG_DISPOSE_OP_BACKGROUND 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: B9QZ0ySf+rEN They should be treated the same as APNG_DISPOSE_OP_NONE. Broken in 5663301560. Fixes #9184. --- libavcodec/pngdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index f2e6f689b0..16c4c3a283 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1622,7 +1622,7 @@ static int decode_frame_apng(AVCodecContext *avctx, if (!(avctx->active_thread_type & FF_THREAD_FRAME)) { if (s->dispose_op == APNG_DISPOSE_OP_PREVIOUS) { ff_thread_release_buffer(avctx, &s->picture); - } else if (s->dispose_op == APNG_DISPOSE_OP_NONE) { + } else { ff_thread_release_buffer(avctx, &s->last_picture); FFSWAP(ThreadFrame, s->picture, s->last_picture); } @@ -1671,8 +1671,8 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) pdst->hdr_state |= psrc->hdr_state; } - src_frame = psrc->dispose_op == APNG_DISPOSE_OP_NONE ? - &psrc->picture : &psrc->last_picture; + src_frame = psrc->dispose_op == APNG_DISPOSE_OP_PREVIOUS ? + &psrc->last_picture : &psrc->picture; ff_thread_release_buffer(dst, &pdst->last_picture); if (src_frame && src_frame->f->data[0]) {