From patchwork Tue Sep 24 22:02: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: 15265 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 F335C449BE7 for ; Wed, 25 Sep 2019 01:03:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3BFF68A1D4; Wed, 25 Sep 2019 01:03:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E54E689CF1 for ; Wed, 25 Sep 2019 01:03:36 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id v8so3804104wrt.2 for ; Tue, 24 Sep 2019 15:03:36 -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=2zuzO+KLUfX5uhZlpnDHkVB4a+XNKY7iEOwNrUJ4RuM=; b=r5b3MDs29xFVYR2FtHxZR+/b9kL9Lo5UaYrJ4sJ12a2xme9Q5GmPiYILecrnR1yCFj sC93Hhufk5zID4wocENPkp5f7Vd5WLgDz4/rLPNnUf9bo7l+RkCHnlBjUDOoUHq3PB4/ Nry9Med2CbvlL/fD0QRvv78K0OnmxSe8q6mS/w5Bd7TO32WdZ1oLMdKU0+jqWDfonj+h RKMNZAgm01ugC305J+6wAYa05+Cn4R1YHtQ0OR00Lg55BiMkrA3/lCNBrchybrbnM6hp mOO0CQXfNFh9D3stIo+NvfC9fCLtR+vQPi8Y717mem3thD4+8A2LtAEbxyvJw62lkpmz iZPg== 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=2zuzO+KLUfX5uhZlpnDHkVB4a+XNKY7iEOwNrUJ4RuM=; b=dB+1sllimxMzBAKkNBJ5m8Gy1G76xsSRvKAP9swZFCbLr63YEGOxwRWfL74oip/adt BhfChXw4S5QgbHHiLY2Upr0H/3KN070j+bZXTnDofq+z9+mNcDUB237KbR+07RgSzpEK +G85LkJVMDMY6xiWh2Hnhp/mNg0Hu+5CLkDpc5UN7V+ws4KeHrWlz6/nNrr3aKAqHwH9 j14Dea1VeD+9yFsgWg6x2xvIR5PU2Dr+wTwQvd0Vf29pc0zqEMnMzgHtZlDtw+37GryF nwz9A6f0SXJUqp4ZLwWOpIkGzRCKBhOI7b0e+djgShTRPj5f9Q7dqF+gVAr0UOIObimo /MSQ== X-Gm-Message-State: APjAAAXN+Mex5JQLRWtUEM9pk7KtnzQ2Q+VsWrO8h4N5KC7zGSznaAcy PMURxDAxRWGiUdLwaBTy2qxfjmOV X-Google-Smtp-Source: APXvYqyh07+BJ0l7RG3vsxay8IWj4pr0o5FNs8Z9ZLX5kE7Po0umZQDUcOb60uADgzcw2VRfcrjj7g== X-Received: by 2002:adf:ce86:: with SMTP id r6mr4973248wrn.57.1569362615614; Tue, 24 Sep 2019 15:03:35 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 15:03:35 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2019 00:02:58 +0200 Message-Id: <20190924220310.31157-4-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 03/15] avfilter/vf_xbr: Fix left shift of negative number 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" Affected every usage of vf_xbr, e.g. the FATE-tests filter-2xbr, filter-3xbr, filter-4xbr. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index 2c71871d22..a854fb0c8c 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -395,7 +395,7 @@ static int init(AVFilterContext *ctx) int startg = FFMAX3(-bg, -rg, 0); int endg = FFMIN3(255-bg, 255-rg, 255); uint32_t y = (uint32_t)(( 299*rg + 1000*startg + 114*bg)/1000); - c = bg + (rg<<16) + 0x010101 * startg; + c = bg + FFLSHIFT(rg, 16) + 0x010101 * startg; for (g = startg; g <= endg; g++) { s->rgbtoyuv[c] = ((y++) << 16) + (u << 8) + v; c+= 0x010101;