From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9BD7943823 for ; Thu, 30 Jun 2022 07:57:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D17468B748; Thu, 30 Jun 2022 10:57:47 +0300 (EEST) Received: from out203-205-251-72.mail.qq.com (out203-205-251-72.mail.qq.com [203.205.251.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C85268B5F7 for ; Thu, 30 Jun 2022 10:57:39 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1656575855; bh=2TLeQ6Tn7QyqT5+CIeF+cteaGFmBIJbgo3zNqOVvs3k=; h=From:To:Cc:Subject:Date; b=fGTUtHvg3VGiKmMx7mMyfobCbNNnGhiyVjylBPxqATGgD0Q3QsY9LuD/gMnPr4EIC if5dc83vwnPr+H7gdGDQVIGUSj8FwLP9YW83nxH+5hqDhzHP3S946SwzSm2I6QQiC5 g2Z6yxZZfmh32MnKaWHGeK0l65rs8ht6ezdVCOsA= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.63]) by newxmesmtplogicsvrszc13.qq.com (NewEsmtp) with SMTP id E612C0F0; Thu, 30 Jun 2022 15:57:33 +0800 X-QQ-mid: xmsmtpt1656575853toencyz3f Message-ID: X-QQ-XMAILINFO: MyIXMys/8kCtwOW2JHsyc1UZMjgTdRnhLncD9uM23kVXaPgHQA1slhPEgI1tQi +KraRIiU93tzavl8tfse4VR2fZ5xr7Jabded+HIZQwEAIk38fUoxpt1p1izg5jIMzHCyvFXnE2B5 oCpUllqO6pamQD1nZF0ZtI54ycrCk3rP0WZP5qvwaWmUdDmYOQdWIs43yBFvp2phdHuR4940gRnI JwzwWQskYMWJJbsT+U6S0OpeJAG12NOe+MHBe8xUpZYEL4ql6Rt0Uz82S81F2wNxx0ylNV7G+nai meupngc+UAL7C/0YDEAtv8eWTob+06tkDL1oE8Gz+E2ybchvyKHxNQwX3AqBGwPg82bZuSmzyYWn 5qtLRwgGLFzzQKjaS9SU/p/K7OswSJgLid62WayIqITFY/N9gqbE59UnpJKIKxlDaL2pZ+fxEP1K CRH9sKbmcrN2zAL4+K1tHBFjZfeFfWzFoISa2kVQQbe7o+2jM6hGoGFy5BdMqaJxE+Sn4CM13fiA oX5sb79aICKjQW2NaSIWEjuvK+2KERjwnNLCCJ4DXstAQvHm1a9yBWgaocjZNj2KpShE7wyZDCMX o1ne6pX+VAjIIBjSt3FVF4+enJDNz+r+aUhuLNgGBrRdafh5UnKmAqxN/wLwqpoS+6R1X4v4kT76 GTQWntQkRdTkb6cBUFzfdXITwPEfEWaUtxzaGQCVhLruqQweWCT9LNzJRE9x56ABjFi4ZsYQl00+ 6Ko3kGegCnFl8kOikY6YJLDvP5frIuDGOblMxg0aGXEU7dayrvb/1/Mfbta0iYx5lyChMieA9PvY b9Agt9cRL/asecPv2qlq8UZY/jTx1rofaYMgV/zlmxz6N5OJN+m3XftrNZBe8Gm/JkYMrQaHYbRz +NCuSV37Ic6KoVA153YjhVTdmLe4yVeFuxTQ9NjmwpibpOuPnRz8dp1ymusp3jBg== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 15:57:31 +0800 X-OQ-MSGID: <20220630075731.75003-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili Fixes ticket #9816. Regression since ed0001482a74b60f3d5bc5. Prediction value larger than INT32_MAX should be treated as negative. The code already depends on undefined right shift behavior before the patch, which doesn't get fixed by the patch. 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..5f2af2e147 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)((uint64_t)predictionA + (predictionB >> 1)) >> 10); p->filterA[filter] = p->lastA[filter] + ((int64_t)(p->filterA[filter] * 31ULL) >> 5); sign = APESIGN(decoded); -- 2.35.3 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".