From patchwork Thu Jun 30 09:09:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36550 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp173008pzh; Thu, 30 Jun 2022 02:11:05 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sDvjHKXKxmdh3iG0pSt5igWyDEnExkIn/STOK0vOfODgz8WmADpRGad4cWr6/za4eUzBES X-Received: by 2002:a05:6402:40c3:b0:435:c020:552d with SMTP id z3-20020a05640240c300b00435c020552dmr10166527edb.387.1656580265042; Thu, 30 Jun 2022 02:11:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656580265; cv=none; d=google.com; s=arc-20160816; b=0SlzqeRyRnETLk09QU9Oa99ted0he92Pz/dWmdJOYY85bLf4MkJfz7eRMJmwRiOOt4 ZO0sLZHB6d8z4b+xIrmP92ELKMZ7qj+yvoaSjvHoiraroq2b6PCBlr27LEwKph7/dDGY AH7Rn8dRXh89OdbT+O0xs1z6UrYlYMmOrDhRE35jqBjSFyBg1QMyHIfJZJ1Mmi9GSECr wxHoywySf6BWbRgHQQRwHrcGIJ+gsuXu+teSqsOh+4mXH0CFGezpHtVdmY9hmo7QSEJ3 3R/jva9KZQaJuabntPClvBRx5cQkGKeOXCZOMSLA112GAQEES703l51jAzEI+2u0dQaB zQkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=VTtVnj2e8cjw6tYrg28zB+ody+AMotnU/bqFKF9v3qQ=; b=lyvnGwM0fLH/jRT4z+6yGHM9iXzDsNp5nQ2+X3rCUWNINzCAMlLdE96VuGZjZptG69 zIY2kl/0EXEZy9dW3rPoGpuJcCx1eOb0hxGTM25q6npbQArlob81nc5cLFxMIRZRTTIk 6FyMkFg382pWbxBzjuFXcaTXd8h4x/nDAEx1uIdSqWjItrxl0NVbFw0lEcr1mz+vpg2U qvxCH7KuuDKncBwUgIYnix/L35aXNzJn0UIXUB2MatdG2rHAQsjCtWA8tJT5J337utvC 5+1Hg22H0hvSNgpd8obuUX3CO9kIPlbg2KEGEEZbpUrY62MMmvgkC8SKLIaxV1joQvT6 FHWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="KHH/4h3t"; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a4-20020a509b44000000b004359f333398si1822280edj.321.2022.06.30.02.11.04; Thu, 30 Jun 2022 02:11:05 -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=@foxmail.com header.s=s201512 header.b="KHH/4h3t"; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AEA5B68B60C; Thu, 30 Jun 2022 12:11:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BFF768B28D for ; Thu, 30 Jun 2022 12:10:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1656580251; bh=7ONGJPYRs9CXUd6NAYONQLddUz8oTbTEQm3gw75xyUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KHH/4h3tVcgzljRgZrR/vbFub07tEcDPdlJCyqRe3swoOjhsw8AbmeK9p8mJGJjxq gxVgDbRWulOO0snwwkVV4xiLs2BzU6ZyFeN6+0MQ0xAbl4ApXFwMAPc3rTU8KNhSNz ZotDVyHjzoBfZqoYOIAuFwqdrttkalw3l+/aMGus= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.63]) by newxmesmtplogicsvrsza35.qq.com (NewEsmtp) with SMTP id 266B5C30; Thu, 30 Jun 2022 17:09:38 +0800 X-QQ-mid: xmsmtpt1656580178tg0lluazg Message-ID: X-QQ-XMAILINFO: NMMG1eKt9nPG2G4GMUkUsr0hytkIih66lGBxN33wTN1cHRwdLxgPK2lOKIEZZp aEiqfi61IIkkq3kqlglaRvSBlvEyJBH5ehCTahKWsAvziKe6jcF7U9mSO1M4NQ0qPj47z++v2KX8 k7+qn6VIJzRdVfW9+7BnhXf/4EfLjMvOxO9lOMZUyQVFKE8PKBRG+PJDrOPC0zWIAFr+5Ndxz6wE 9NeBwfnQa025ttYnHp9DVnZzkZ7Uor6OHLzzdYNnYMIHGjTc7Vi9vDPF6OviAuh2cyuGiLp9ZHiS 9NLA6+6nqBc+Htu8f3CJdU8+/Gsv67Uva1AoSETaIWQHVp+x5E+ujMUOWCwUyxTpWF2l6icZQk9P xoo7zrXeNMDDF31Us8fRiCd+GBXnPFksAtyu4YJSRpcLWy0KafJCO9FsXRNAN60YPqCYi5TP38ao Azq9ON8DMhERwYLjv2u7PDvePkraI1Nw2rUi5QebEq8ONsWXi/5K5s5DbGC4Mt7/Yey3ZPdhOPjP X31RudVg3L4SfpAE+OfiBAYSkO1iKDxZICb6MbY3UgSFeo+QS0u89dyV97Hg69dNQvBK6L7VyIIq ABMACH2gBOZwG5+4g1tzRTsjzVJWtuYYwx3f9Idbq5e8a/cLDLE4lsajw9X0eP6vKutqyeP3v4f8 8NEgYPOUYFG6SfkQWNB3Si474flg51OPQa1b9xHouIu+58gnrYlXFTrxpjIQOqwU6xEMwrU5tYJL XJ34KY2l1il+bzsCBpY0CIh7zgHcSTd1e65akrShFvyTZIyqnQ3nAb+h9T0dGwwT0DH4FNpwb32c 4+d5KvpIaeRWsMQY3hXWX5Gr2hv7VMAaxEfvlBAuYCTPTNdK7tssdllMocyVjLKTG8YbnWMjBlEm 2Q7KrdxOOJYvybDxJ+xLTHDL/gHxUL3I2cBL1d8V/MFWKhQk4kWd0eU49uxSPgJfwaytOz3AhoNg MYM2YXz7OLtzQtd6faagEBix1JY8qs From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 17:09:36 +0800 X-OQ-MSGID: <20220630090936.35124-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/apedec: fix prediction 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: C5ZMUV56pImM From: Zhao Zhili Regression since ed0001482a74b60f3d5bc5. Tested with: ./ffmpeg -i foo.ape -f md5 - for samples in #9816 and #2239. It gives the same result as before ed0001482a for ticket #9816, and doesn't break ticket #2239. Signed-off-by: Zhao Zhili --- libavcodec/apedec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index a7c38bce1b..f5c0f75f7f 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1198,7 +1198,7 @@ static av_always_inline int predictor_update_filter(APEPredictor64 *p, p->buf[delayB - 3] * p->coeffsB[filter][3] + p->buf[delayB - 4] * p->coeffsB[filter][4]; - p->lastA[filter] = decoded + ((int64_t)((uint64_t)predictionA + (predictionB >> 1)) >> 10); + p->lastA[filter] = decoded + ((int32_t)((uint32_t)predictionA + ((int32_t)predictionB >> 1)) >> 10); p->filterA[filter] = p->lastA[filter] + ((int64_t)(p->filterA[filter] * 31ULL) >> 5); sign = APESIGN(decoded);