From patchwork Tue Jan 21 00:23:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17443 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E2087448F94 for ; Tue, 21 Jan 2020 02:24:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BCAA368AEF2; Tue, 21 Jan 2020 02:24:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F77C68AB2C for ; Tue, 21 Jan 2020 02:24:08 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id f129so1198066wmf.2 for ; Mon, 20 Jan 2020 16:24:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jfF5w0dX1DR7MUVvmsAbQv5A4cvaCm4mFdnfJfZ0E6E=; b=Zy73yW3wX+53KxUFyVHAvEM26FDj5C7sk932r1gHz4ytBHTk+k6iBsg482Pb3L1A9i 4C5gErqGbeFr/4ffiulinqxnq07PWOZB3gOoJxN2D2Iikx8QgDE1zI0mRKYQnBXxORCf S9O0P9xidw/9XRxuEpOcsyv4crtFC1hljfCXCmhI/J2p2NXaJMbDicpOR/9Yw6VTCJEl 3hFEsPfotQbf6E8eqx9Pmhe4HaqFnVFa55SHEMkwxBu7F4c4K5UqASufjeM9qstjR6OA 9TW8Ez5qLF3V7sYU60awKhPAxLGguIsmnXJDVIGQJA4s3DAT6kJsPhTOwHLM7eUDzWNQ r12w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jfF5w0dX1DR7MUVvmsAbQv5A4cvaCm4mFdnfJfZ0E6E=; b=TqVnE3NsbMeO1SxldfSuLs42axKVM1KYHxoBtSyYHNnozJrCFqTac2jmCR95g09wIO dd/iLE04XAbSfprtfS9gwz65GJmzdwb3DvoCNykuz3w4byj3m1mHLg/sFlH61KVif8eZ D/Z79LtvRjGEUt2s8Gjwm2IS5y3hBDbXsTDJrvC0mAWm2jBeD1Rrwk9oEFStrKeBv6VW TsKiquNrZWTNBghZBBcuK8yhNsx9C5y7KH5FXhdUGBzG8lJPau9l+exGMJ5mdKgeG5xx YRCSymBOgH/OX85eLGiQ6vrYslbkNUHXKaWCl9+2u+1lh6M5LqkJIvtdTc607dVcZfpY Uhng== X-Gm-Message-State: APjAAAUarLEFpXI4TZUKYXWah5YS6VE2Z9H4O504zB0QpSVFcpIRTW6I ayM3nyr8BldZ14gKiJ7uEbZaoMim X-Google-Smtp-Source: APXvYqyCnNHce55bL2gQmiELu2S4iTucYT/6irLi08+dUXogMPX4UdnDaxhDh4KaKlC3rLF0UycxKA== X-Received: by 2002:a05:600c:1009:: with SMTP id c9mr1292484wmc.162.1579566247736; Mon, 20 Jan 2020 16:24:07 -0800 (PST) Received: from sblaptop.fritz.box ([188.192.139.191]) by smtp.gmail.com with ESMTPSA id t1sm1402102wma.43.2020.01.20.16.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 16:24:07 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jan 2020 01:23:47 +0100 Message-Id: <20200121002348.16914-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/j2kenc: Fix undefined shifts of negative numbers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also add parentheses to some lines to make the operator precedence clearer. This affected the FATE-tests vsynth*-jpeg2000 and vsynth*-jpeg2000-97 (where * ranges over { 1, 2, 3, _lena }) as well as ticket #7983. Signed-off-by: Andreas Rheinhardt --- Supersedes https://ffmpeg.org/pipermail/ffmpeg-devel/2019-September/250683.html libavcodec/j2kenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index e91d932bb7..38643c9a28 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -521,13 +521,13 @@ static void init_luts(void) mask = ~((1<> (NMSEDEC_BITS-2)&2) + 1; - lut_nmsedec_ref[i] = FFMAX((-2*i + (1<i_data[(comp->coord[0][1] - comp->coord[0][0]) * y + x] << NMSEDEC_FRACBITS; + *ptr++ = comp->i_data[(comp->coord[0][1] - comp->coord[0][0]) * y + x] * (1 << NMSEDEC_FRACBITS); } } } else{