From patchwork Sat Sep 28 02:26:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15350 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 86487449F5A for ; Sat, 28 Sep 2019 05:34:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 69BEC68A5FB; Sat, 28 Sep 2019 05:34:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7E76689956 for ; Sat, 28 Sep 2019 05:34:03 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id y135so9801718wmc.1 for ; Fri, 27 Sep 2019 19:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+jTeLTzNhZVkepwn2+GwYr+NvTZ8Oqd1PtoghT7FGTw=; b=cdm+iN8ADzsXZW8mQNX2NlrWeyLb1VWsORhSfEGdIm5+kWJZhzdeoPXt2Sz+uCp1iF jNpM1/gjjezfitPe/oQV5cDYB3DVyt2cwf7p3RubygRUu7vg57URRGv9QOEowX7ZU4hR XY4DT8e0PzNikRoGZNF4zDYSiv9n01jAWUrbS6oAcQ1AS4HKN0JtuL3al5bovecGTt5Z r+mWS5aK+4eUJYHrJIXu29c2VyDUwKMFNmXDRUv4HLN8aOQQhwhOW4npuI5zLCgjGeCP 0mfz7A7omvg0++pLuoQOL1vVAZqEooEFCUZL6jfpskemUpyIjD4M1jhLi0OtezPZc+xx IWxw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=+jTeLTzNhZVkepwn2+GwYr+NvTZ8Oqd1PtoghT7FGTw=; b=OqEYMDP7AJpK+haTFR7nLjxTyG/MZQ26gIbjy1ABocSvXoUb+OfojYcq27pv4baZwW 0vAuc9tQ9Fap5/ndfswFzMokxqccnsfPmxxZvaBJwwuON0M9JHIE5lgGoXrFfe9m9a6e 2coKGCH6KKp0n6fyqhi8t1x2YJSAYlzWFqmvEDaqCLmeJRIMD0NWIrTxvKT9DrYzSMkS N2KF2wWVUMERi6E5fqCld4kCyuFNu4Ki8sEwTkqD9oXpESTrhIufeK0TOmYrrwFvEQSt RXaaDBNHZ7A44YfRiqxVlTqM7uhg96dMeTXeksGvPaNOJsMXh+ru8eNRQ0iabLZY7ejU r7Ww== X-Gm-Message-State: APjAAAUZhoRhlDVhECbKNmzUoEmbTiQfkdcdurJ/vbhFZI+hiGYTAlLQ 2eh690amRPv5SIpPUGwk/RQQGT7i X-Google-Smtp-Source: APXvYqywLj+HXr6ObydP4IHkbjO8OgbYur0UsFjDUAvynDYGIKMZoFysNu5dM1tKvMKpKrC8aksSSw== X-Received: by 2002:a05:600c:d4:: with SMTP id u20mr9789821wmm.66.1569638043132; Fri, 27 Sep 2019 19:34:03 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id r7sm4484231wrx.87.2019.09.27.19.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 19:34:02 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Sep 2019 04:26:08 +0200 Message-Id: <20190928022610.5903-13-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190928022610.5903-1-andreas.rheinhardt@gmail.com> References: <20190928022610.5903-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 13/15] 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 --- libavcodec/j2kenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index e91d932bb7..b5ac06b906 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{