From patchwork Sat Sep 28 02:25:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15344 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 22234449F5A for ; Sat, 28 Sep 2019 05:34:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B9A86899EA; Sat, 28 Sep 2019 05:34:02 +0300 (EEST) 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 CE459689956 for ; Sat, 28 Sep 2019 05:33:55 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id r17so9816049wme.0 for ; Fri, 27 Sep 2019 19:33:55 -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=xm+V/W7gO+n9WbBFjRJeuQ508Jt9IrJ6fgWgZ6iM86Y=; b=M1ahX8o0+ofzEszpb7SVK/om1SpyJ6b7GDGgDQOrDacRjVFW4xgYKoJVBxgDh0QTYz UtnlJy3gXNcxBbu37EvnFJNpa1HeBpy9Ab1L86gnWQYZagyiLXm0jcdqDrBn8VeT7uVA vdhWHLBINe/0R9tdZLzhN1zq0G8+CvczSF4nf3mx+1EvKWyk7SS96SPAF9xQw/epwT6c RB3gRry17qcdcdBFQDHQe9AJVsNzddd5yKqyHi+eYP5i9LgYaEuVAev29U6lgst9x6TJ RzHFxkygOsdJV6jkXGiCZrzOxxaeMaKRTke1wSHuoLztfFIx9EO2OFn0YocRyyZ7adLU lgPQ== 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=xm+V/W7gO+n9WbBFjRJeuQ508Jt9IrJ6fgWgZ6iM86Y=; b=hGzW3Ii3qIsOkYrZoZgr5XKvgK6mEj2HfJ++O4mwe/xzFjqmUT1K9Al+5hztEpx9U3 u9mCQJkMX9aq5shcxsAt7yqi4ML9PqQn1QqwrO5EgwHyS8vgwl8MqEpE5YFOgJGR7sHo x0pKcTIpTYNorHX+IynlGdy4nwrUIrLgy1ADrMxsS40stwDfRjrGM4iGTUp0trZ5srPB D6GL9tbW0W1s/VeyMhOy43HIc/Gp+G3A1CayGwZRqBFZkJwvGO8xlv3fbCpYo9oEpx3x NqRKCrITcenHVVz7x2vPUZk35Uy6bIi44U71RJhBroyntmVQt9g9sTmV2HnLpxIYFFX5 1DJg== X-Gm-Message-State: APjAAAUmuqdONTDKLi95tFVAtm8iivfsNnbv/LTaL+Ap9zn65lVBWfp6 khIG72hUO0eNA8S5HarWjRUjZ+1L X-Google-Smtp-Source: APXvYqzUhSQvImUan3Bpvx0wUSJ4JUEDldWzzzX20aDGZ7OZg+HTjD6/cOsXhyvaZagMocD7pZBHGA== X-Received: by 2002:a1c:3904:: with SMTP id g4mr9686338wma.116.1569638035205; Fri, 27 Sep 2019 19:33:55 -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.33.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 19:33:54 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Sep 2019 04:25:58 +0200 Message-Id: <20190928022610.5903-3-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 03/15] swscale/x86/swscale: Fix undefined left 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" This affected many FATE-tests: The number of failing tests went down from 663 to 344. (Both numbers exclude tests that failed because of unaligned accesses in code that is inside #if HAVE_FAST_UNALIGNED.) Signed-off-by: Andreas Rheinhardt --- libswscale/x86/swscale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 7dc2d70574..0eed4f18d5 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -160,7 +160,7 @@ void ff_updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrB *(const void**)&lumMmxFilter[s*i+APCK_PTR2/4 ]= lumSrcPtr[i+(vLumFilterSize>1)]; lumMmxFilter[s*i+APCK_COEF/4 ]= lumMmxFilter[s*i+APCK_COEF/4+1]= vLumFilter[dstY*vLumFilterSize + i ] - + (vLumFilterSize>1 ? vLumFilter[dstY*vLumFilterSize + i + 1]<<16 : 0); + + (vLumFilterSize>1 ? vLumFilter[dstY*vLumFilterSize + i + 1] * (1 << 16) : 0); if (CONFIG_SWSCALE_ALPHA && hasAlpha) { *(const void**)&alpMmxFilter[s*i ]= alpSrcPtr[i ]; *(const void**)&alpMmxFilter[s*i+APCK_PTR2/4 ]= alpSrcPtr[i+(vLumFilterSize>1)]; @@ -173,7 +173,7 @@ void ff_updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrB *(const void**)&chrMmxFilter[s*i+APCK_PTR2/4 ]= chrUSrcPtr[i+(vChrFilterSize>1)]; chrMmxFilter[s*i+APCK_COEF/4 ]= chrMmxFilter[s*i+APCK_COEF/4+1]= vChrFilter[chrDstY*vChrFilterSize + i ] - + (vChrFilterSize>1 ? vChrFilter[chrDstY*vChrFilterSize + i + 1]<<16 : 0); + + (vChrFilterSize>1 ? vChrFilter[chrDstY*vChrFilterSize + i + 1] * (1 << 16) : 0); } } else { for (i=0; i