From patchwork Tue Sep 24 22:03:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15268 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 0960E449BE7 for ; Wed, 25 Sep 2019 01:03:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E24F368A38B; Wed, 25 Sep 2019 01:03:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9CAA689E01 for ; Wed, 25 Sep 2019 01:03:38 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id r5so3778715wrm.12 for ; Tue, 24 Sep 2019 15:03:38 -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=gw2dfkltxv0G1T+ZNFNDXiKsJF4qzpBYReZQbWWCJN0=; b=Y26MT8ThEkBCnXv3vSn27KyK7lS2g0g49lsjh1y3qG7vEIbekWxxcqfevYBJJWMaRF 590G7BMHRXLKABt7YcV6K0KEzgDl8WsvD1jhTySEtCrGLyVPYW9tF12ZAPVJR2A3NzC+ pT05R+qmnhOmlRaOIMMP4CPwsUJ7rIjV7uLMlA320dPaBPUQcwLb+0vYI+YJT7qN7IJV BRldvpE/u/+UbNtNUQZjMTZ8ARkUxU9phf4W7vAFMkZeMRQFqx3cpIG5wZypJcQcwv5R kKRJJt/2jR+N4AUJgp+rBlTA9tis3f0uTZ5fn/39veI6f7qd2fixfJDl7weVMq436F4h e7mw== 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=gw2dfkltxv0G1T+ZNFNDXiKsJF4qzpBYReZQbWWCJN0=; b=g0dO3NlSip+NwHbZWAyrVDcvld48eNAppMyhavnkjppl71WFSHcm/RWUD2GzHbnKhP QsApqIE/iGkWXt16+JqRTDmPfbWcIH2v6XxMTPdZRqxzRQKODdSNvT4cT6348djOB1Ra 3Dfd/UvF2i/aoVZAJs6rHV9wm6+B05e41EiubjdyHj3GVyh/xA1UABqVJ/Zw2C48p/VR MtCNA59BzpO/dKPs1okC5Xn8usMS8IpzCu6sOCZkEZGI4cRm93E2ZBCIp1aWFn4B7Zd1 YVVnYgicyvpLqEAIJdFTeKPCyuSSQkLQaYfn1iValQrqoHQIg6xY4sfU2M9fTydn3nKA s0Fw== X-Gm-Message-State: APjAAAUFcdjDN+kSaTIT5qpnjcCi3toELBkavXBQsKNPoIe3uaoex/u2 L9GjB2gtZlqb+C7DCA4wmEcc7pk3 X-Google-Smtp-Source: APXvYqz1gt/29Wq37KInU54UscAijtGK4OJ6OmLqm9TvMoFmMxxApQWQ2p4InQ6GwRSgb0kqhEwVHQ== X-Received: by 2002:adf:a515:: with SMTP id i21mr5163904wrb.185.1569362618028; Tue, 24 Sep 2019 15:03:38 -0700 (PDT) Received: from sblaptop.fritz.box ([188.192.248.87]) by smtp.gmail.com with ESMTPSA id l1sm3023808wrb.1.2019.09.24.15.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 15:03:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2019 00:03:00 +0200 Message-Id: <20190924220310.31157-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924220310.31157-1-andreas.rheinhardt@gmail.com> References: <20190924220310.31157-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/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..2b47ace1b9 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 ? FFLSHIFT(vLumFilter[dstY*vLumFilterSize + i + 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 ? FFLSHIFT(vChrFilter[chrDstY*vChrFilterSize + i + 1], 16) : 0); } } else { for (i=0; i