From patchwork Mon Jan 9 22:15:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 2164 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp7258155vsb; Mon, 9 Jan 2017 14:23:32 -0800 (PST) X-Received: by 10.223.177.195 with SMTP id r3mr1251083wra.122.1484000612226; Mon, 09 Jan 2017 14:23:32 -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 g10si71137079wjx.7.2017.01.09.14.23.31; Mon, 09 Jan 2017 14:23:32 -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=@martin-st.20150623.gappssmtp.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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 436C4689208; Tue, 10 Jan 2017 00:23:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 538316806AE for ; Tue, 10 Jan 2017 00:23:09 +0200 (EET) Received: by mail-lf0-f65.google.com with SMTP id j75so13014002lfe.3 for ; Mon, 09 Jan 2017 14:23:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=uEvkoMkL6vE4CJg+mG05XvE/BBQIrCuvPkoa4blZFrM=; b=D2D55exwwBzbRl60i0pBr6PsD3tIyNSlc/v6qfcRVoZfGBSQiuQ7fsLlZTrXRZspmo wwZ/YpM/dcb1cL4f/lPxLovsVVrtqE4c7XXX7BIUeqsOAzWajYoJEPwjhIf8sJbJIXDY OJExzfmeyDquhfmu/n4bi35j5vwJ6F0TF9ELGrz+X3QMw4NWEpjVKlGKMZOfsgFc6mtx WkVKwl+4D9eBD9riJ6aA8C3vKqTu5GmjIJwLHcUzScU8ZL6ZGMHFUkqA9KAyW14coZWj mzu6k3gxUTgP1pajRFkwCBOUAmwtNLAVqX7KVc1LVo6TDEhmbmRj5GYmA6dOJ8lgXrVA Ck0A== 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=uEvkoMkL6vE4CJg+mG05XvE/BBQIrCuvPkoa4blZFrM=; b=RzP6zWOWluMDbD8QPsje9RPEW43SkGLcbZGgYfNhYZZLSUApIVOWCD1sq3acj06gTZ mV8gxt/O9nS07bllufmyuG/d2XCHyA9NnezqqXGlUob6vQ94LPAvvkXfkBb9LsyUaRWW jWd8euw4ybd/gfd9sKRuttDrPHClnOhSxJPN/3ovAXxO+NP35UF7gHbceiDRflvOcc1n 3DRNAe19XoBfvb5oOlzR4iuwYkx2U7T2YzqPQeHcEb3HipHVhEPnweSYSLScXOVKE6TG 4CfjD3c/mYJz9RaUhS6A3IEpojD1MblQzc/0xc/nQW7SgPqNKRJIOEcvsYPKd6Yf+9dU 6Fmw== X-Gm-Message-State: AIkVDXIiYMeoxP7WCl3HmBMSuEy0XrMiTxvAB8c7+KJeBxDZsV8kk7sKfOjDj8oYrdZl9Q== X-Received: by 10.25.19.170 with SMTP id 42mr26486459lft.174.1484000130820; Mon, 09 Jan 2017 14:15:30 -0800 (PST) Received: from localhost.localdomain ([2001:470:28:852:a9ed:5432:636c:1053]) by smtp.gmail.com with ESMTPSA id f25sm1358538lji.26.2017.01.09.14.15.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jan 2017 14:15:30 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Jan 2017 00:15:18 +0200 Message-Id: <1484000119-4959-12-git-send-email-martin@martin.st> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484000119-4959-1-git-send-email-martin@martin.st> References: <1484000119-4959-1-git-send-email-martin@martin.st> Subject: [FFmpeg-devel] [PATCH 12/13] aarch64: vp9dsp: Fix vertical alignment in the init file 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" This is cherrypicked from libav commit 65074791e8f8397600aacc9801efdd17777eb6e3. --- libavcodec/aarch64/vp9dsp_init_aarch64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/aarch64/vp9dsp_init_aarch64.c b/libavcodec/aarch64/vp9dsp_init_aarch64.c index 7e34375..0bc200e 100644 --- a/libavcodec/aarch64/vp9dsp_init_aarch64.c +++ b/libavcodec/aarch64/vp9dsp_init_aarch64.c @@ -103,7 +103,7 @@ static av_cold void vp9dsp_mc_init_aarch64(VP9DSPContext *dsp, int bpp) if (bpp != 8) return; -#define init_fpel(idx1, idx2, sz, type, suffix) \ +#define init_fpel(idx1, idx2, sz, type, suffix) \ dsp->mc[idx1][FILTER_8TAP_SMOOTH ][idx2][0][0] = \ dsp->mc[idx1][FILTER_8TAP_REGULAR][idx2][0][0] = \ dsp->mc[idx1][FILTER_8TAP_SHARP ][idx2][0][0] = \ @@ -128,7 +128,7 @@ static av_cold void vp9dsp_mc_init_aarch64(VP9DSPContext *dsp, int bpp) #define init_mc_func(idx1, idx2, op, filter, fname, dir, mx, my, sz, pfx) \ dsp->mc[idx1][filter][idx2][mx][my] = pfx##op##_##fname##sz##_##dir##_neon -#define init_mc_funcs(idx, dir, mx, my, sz, pfx) \ +#define init_mc_funcs(idx, dir, mx, my, sz, pfx) \ init_mc_func(idx, 0, put, FILTER_8TAP_REGULAR, regular, dir, mx, my, sz, pfx); \ init_mc_func(idx, 0, put, FILTER_8TAP_SHARP, sharp, dir, mx, my, sz, pfx); \ init_mc_func(idx, 0, put, FILTER_8TAP_SMOOTH, smooth, dir, mx, my, sz, pfx); \ @@ -136,7 +136,7 @@ static av_cold void vp9dsp_mc_init_aarch64(VP9DSPContext *dsp, int bpp) init_mc_func(idx, 1, avg, FILTER_8TAP_SHARP, sharp, dir, mx, my, sz, pfx); \ init_mc_func(idx, 1, avg, FILTER_8TAP_SMOOTH, smooth, dir, mx, my, sz, pfx) -#define init_mc_funcs_dirs(idx, sz) \ +#define init_mc_funcs_dirs(idx, sz) \ init_mc_funcs(idx, h, 1, 0, sz, ff_vp9_); \ init_mc_funcs(idx, v, 0, 1, sz, ff_vp9_); \ init_mc_funcs(idx, hv, 1, 1, sz,)