From patchwork Wed Feb 8 16:13:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 2451 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp2835530vsb; Wed, 8 Feb 2017 08:15:20 -0800 (PST) X-Received: by 10.28.179.7 with SMTP id c7mr17491572wmf.128.1486570519946; Wed, 08 Feb 2017 08:15:19 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x4si2951711wmx.113.2017.02.08.08.15.19; Wed, 08 Feb 2017 08:15:19 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFB63689B6B; Wed, 8 Feb 2017 18:15:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DCA5689A62 for ; Wed, 8 Feb 2017 18:14:57 +0200 (EET) Received: by mail-qt0-f194.google.com with SMTP id h53so23773839qth.3 for ; Wed, 08 Feb 2017 08:15:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=T1OdinLebin8NpjhCj+xacqcL1JQtYYnNnrhcR/WP1A=; b=ZSVdfhzA77cGV6DpKhJIfz9p3otFYQjJ1WLBhC6sa9HWD0u6FJPehk+gauoa2qcj/U gNS+pJUHZ5TDdovutyXrjwgI/ndE82TPywDZFuGyUP48XKaw5YqHAXpl4OauQ0SlKlvB Am+s3oyPgjWvR9C304C0dxEaHec6TxTBrar7ExdQnwndDZMTrXDtdw12LAiCYAZlsbK1 LkZgRc78uUjI2OPoXa3oJMmCvoPAB7YdmMtEL2OSNOR/GWde+jR134+xvmP8zahHJL2t +hz4swgSAX29B4QjoLQNwxQtE1unJlPFi0OYgDAyCeThTWG2FON1mUvYtfZkUDVtia1E 6cmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=T1OdinLebin8NpjhCj+xacqcL1JQtYYnNnrhcR/WP1A=; b=RPtW2Uk9Gfn1gd9bFVGAo0R9+dFEMw8GVPIv5YqWRSVVN7NnGnch+f4LGTC6vh6FTN Tt9ixFAsNrUCJ2xCl7EeVnWlkk6PKY1sAZA++JPWx98QDa1h6X8liF74oN/elCDcj3HT WwaQJyEPJ0DY9qNtD4OE3dYl9aQVN8fEZ7cYSPNUix0t1Sy0Tfi0pkPY8tU3s6NxJBz0 Uuq0vdassYC5ZSeWcggIyU5RYinrTyMHtGAqpYPQSuOU0LFamMAYfJPpbIHobQ6Sfp5S RfGd3FE++6bUGetoZ/jRcZo5VaZDC6n+NaHJM97z9pTaxJcDCNU6udFc42D5gTBYwzTV EuKQ== X-Gm-Message-State: AMke39lW9glE6FF0naz/Vk/lV5pSuCBQ/bwxQOTLTk+vmbdmScXCMLsqmc6GpKzvkzqYrQ== X-Received: by 10.237.62.68 with SMTP id m4mr20014748qtf.171.1486570499605; Wed, 08 Feb 2017 08:14:59 -0800 (PST) Received: from localhost.localdomain ([181.231.87.206]) by smtp.gmail.com with ESMTPSA id d15sm6542106qtg.22.2017.02.08.08.14.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Feb 2017 08:14:59 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Feb 2017 13:13:57 -0300 Message-Id: <20170208161357.7296-2-jamrial@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170208161357.7296-1-jamrial@gmail.com> References: <20170208161357.7296-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/huffyuvencdsp: use an actual unsigned long constant 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/huffyuvencdsp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/huffyuvencdsp.c b/libavcodec/huffyuvencdsp.c index 7edcce872b..427d118be4 100644 --- a/libavcodec/huffyuvencdsp.c +++ b/libavcodec/huffyuvencdsp.c @@ -21,6 +21,9 @@ #include "huffyuvencdsp.h" #include "mathops.h" +// 0x00010001 or 0x0001000100010001 or whatever, depending on the cpu's native arithmetic size +#define pw_1 (ULONG_MAX / UINT16_MAX) + static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w){ long i; #if !HAVE_FAST_UNALIGNED @@ -34,8 +37,8 @@ static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *sr }else #endif { - unsigned long pw_lsb = (mask >> 1) * 0x0001000100010001ULL; - unsigned long pw_msb = pw_lsb + 0x0001000100010001ULL; + unsigned long pw_lsb = (mask >> 1) * pw_1; + unsigned long pw_msb = pw_lsb + pw_1; for (i = 0; i <= w - (int)sizeof(long)/2; i += sizeof(long)/2) { long a = *(long*)(src1+i);