From patchwork Mon Jan 9 22:15:17 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: 2157 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp7257647vsb; Mon, 9 Jan 2017 14:22:03 -0800 (PST) X-Received: by 10.194.84.70 with SMTP id w6mr32935wjy.134.1484000523804; Mon, 09 Jan 2017 14:22:03 -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 x197si11281141wmf.58.2017.01.09.14.22.03; Mon, 09 Jan 2017 14:22:03 -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 A79DA68A260; Tue, 10 Jan 2017 00:21:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7144168A218 for ; Tue, 10 Jan 2017 00:21:51 +0200 (EET) Received: by mail-lf0-f67.google.com with SMTP id j75so13011655lfe.3 for ; Mon, 09 Jan 2017 14:21:58 -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=PoP8ZelOl/PkNMgvoXqCDPMJhYwi8XbDynTvYCsYAVk=; b=eTWLgJ+oQQpjYSM6AvUg3FDQIX2XAqnEy8ztOCXTpcdICOYrcK0DPlAWUFvMv0d4AC bls+qDWW4GkljAXQzHFcEF0z4zaqS0baNN5iMuAaBS2dliNxVpn2QWhrnANX1/Zm2off /PRAYOqPTdA/6Y02sv4ls1Qj7GbyGGbVsoHGAMS1Mzjsu2WdERxfkIQuUscHTP/+M/nv AtG3pnVnVix/Q+Qa5mXS3dWqzaharA9l6G9+9Z8qOUH2koDX5zQyV2dKdD9bJEhXHsgM ggd7UWTS8xhGd7w6emVrxKAtMeTKqSQ8iIQml5dUkq4QtYEvcekI0O98DOcNbgG5pMO7 TZrg== 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=PoP8ZelOl/PkNMgvoXqCDPMJhYwi8XbDynTvYCsYAVk=; b=WYAcdsMoKGbBtC3S26YhYkr9f/TTsOaSay8rGppSDsKrFiDaoY4LhN1y/TocJKD0jF 32mxXi9M60L6KQ3LnQUPj2e84qBDFEIQqc3lNFs6HiBy/e3Fz4rolx9uZr0LEHdF3BZG w04nirYm51yWkENjTD7XmyUHKsBdnOhVDKfOGAXTUNRmJVu5w1lvbLxnlWK5Y5qROr7u lHp8wDBCC9ajkWaqPd7Fopo1eOCJMYASlTVEMQABvY0sc6lQnxa3aaJEjeOZ8qfYDuHF wdgTCi4fwMv+sGZ9YZNQXGnZPDA7JAHCnEH8ke3ucJCZaIpdOvjgDCWY7YG2g4PYeuEY x5uw== X-Gm-Message-State: AIkVDXKaSsRHkKocMc+B2K25PwTQ3+ajnff0gHX0wfT0+xaabnK9BxWa1pra/1NIvRInzg== X-Received: by 10.25.18.102 with SMTP id h99mr31824518lfi.179.1484000129939; Mon, 09 Jan 2017 14:15:29 -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:29 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Jan 2017 00:15:17 +0200 Message-Id: <1484000119-4959-11-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 11/13] arm: vp9mc: Fix vertical alignment of operands 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 c536e5e8698110c139b1c17938998a5547550aa3. --- libavcodec/arm/vp9mc_neon.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/arm/vp9mc_neon.S b/libavcodec/arm/vp9mc_neon.S index 5fe3024..83235ff 100644 --- a/libavcodec/arm/vp9mc_neon.S +++ b/libavcodec/arm/vp9mc_neon.S @@ -79,7 +79,7 @@ function ff_vp9_avg32_neon, export=1 vrhadd.u8 q0, q0, q2 vrhadd.u8 q1, q1, q3 subs r12, r12, #1 - vst1.8 {q0, q1}, [r0, :128], r1 + vst1.8 {q0, q1}, [r0, :128], r1 bne 1b bx lr endfunc @@ -407,7 +407,7 @@ function ff_vp9_\type\()_\filter\()\size\()_h_neon, export=1 add r12, r12, 256*\offset cmp r5, #8 add r12, r12, r5, lsl #4 - mov r5, #\size + mov r5, #\size .if \size >= 16 bge \type\()_8tap_16h_34 b \type\()_8tap_16h_43 @@ -541,7 +541,7 @@ function \type\()_8tap_8v_\idx1\idx2 sub r2, r2, r3 vld1.16 {q0}, [r12, :128] 1: - mov r12, r4 + mov r12, r4 loadl q5, q6, q7 loadl q8, q9, q10, q11