From patchwork Wed Jun 14 11:39:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 3975 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp260600vsw; Wed, 14 Jun 2017 04:39:31 -0700 (PDT) X-Received: by 10.223.147.165 with SMTP id 34mr125496wrp.175.1497440371000; Wed, 14 Jun 2017 04:39:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497440370; cv=none; d=google.com; s=arc-20160816; b=Z71Gm+u/JFGoSBqUU50FvTcxwzvLTUs42+DzxUwWRd8VkhP0U/gpb/W1IXKy8ToXGU LtmWx5j1PB3innmueFR+XrY+ID0FnYo3bF6K31fZm4KX+vO8BjOOzBqNTi74yJ6zdsPK 3kkBKhEPb7jzoBVVdyAqAtg8Nrkqn+1D+qBtprp47RFwIRzChXH24pxi/663TfU9XOB1 N5PQDZpeObN2+oxSSo/kwBENN3SeHSIpsHkhAXA+1o2n2K6RRxjrApMXox+Ca53VMq8s csORD5TVjl3e5MeLdnFV9Gn9T3kTolgMIqkA/0kOgEIbYw72ZWILDbhXp7lRIEUxfhFB sYNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=Mij8c7Ebidj1Py+5PXDemzL4XASSxOnQlUu0H20TvLI=; b=O+iLCp5oFD/DPsXVhn5mMhju6IBBNmzrl6El10r7N76J4oxonwjfZaPnjmpkE79pEx +VlSEneqS4vLMCy76G8g1ad3FfEWszmpD9XyLlG0gJit6x1SJIKKebdEOCCtULXD/WN5 P/h9cpTcNWQmp0DJo2FVhgh86R1RXiT6irpTPzfnLjIJ1xAiQeWEzElF6Rp17kQbQor5 WM+KRyI8O1vl+8fkZ3O2NCj1jxDC9SkQU/WRc0xNCVkscRtD7bGTv9qU+YvCl+DBTVVC JLzFpLZzSOOfg/2frKHvJ6eqJDEBBXkOZ5A6ChBIiY/nQgpA7knVDJ5Tt7bdjoHLsVht wwhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=HP5mkAqV; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v24si726547wrd.237.2017.06.14.04.39.30; Wed, 14 Jun 2017 04:39:30 -0700 (PDT) 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 header.b=HP5mkAqV; 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 6538568A224; Wed, 14 Jun 2017 14:39:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E97B968A171 for ; Wed, 14 Jun 2017 14:39:17 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id u101so38892140wrc.1 for ; Wed, 14 Jun 2017 04:39:20 -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; bh=XOsCoR50A/ZMix/cC8/Xb5d2E9rbaTWC6Nuw2gK4/Io=; b=HP5mkAqVCyuCIXD/3YoP3GnniwJrycLnMKcpVj0eulHNWBT7cNv7FZjAs24RmqbZdm h3O4akPdHnXzezbuuH+JWLg7feOETPJPVdAPlN6LRlEclQLz+ecpkqjtz+Jb4Za6uAA6 3HN4Rjzr2cpBvOTpJzyKoPzGgvYBvBtKzB+kH3CTLSudSR6g/2l+dIAHgAjWv3dODC6Q 48fboGZdOVqOIbDyh7U4Jn5fytEZgl5iP6SJQkgjcsg+HTop5jUYc5e2y3qWl9UtXTLi gKAnlIyzeOKz8fx9ERaaxFjGZQ53n0tO4a5Rp2wmaUsrpC5Bak0RYac76DT4lq0DHJYJ ktbg== 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; bh=XOsCoR50A/ZMix/cC8/Xb5d2E9rbaTWC6Nuw2gK4/Io=; b=g3uzfR7LYUvnFuUxy80wTxMwCJYR9g3gKx7GUdsPjVnizdWoIdo2x4Jr5+5Ew7kOPI JiLbOSkV2VoWaXp7Gmbpll+22c/dfCqqsfvhmS8FOVb2l1y1SODvQJ5CPbdLPB4GPGpP rbM1m9p7eAwqMRnEJyVsq89jHvAzas0SFYnDOpX7gUX1VtEfsgjKFvHHsVOvuvl+blyH mbm1rCRrTQ6PGeihv9a8ItOqKYkBDg1jpeS/8i5gLt4HoQ6wWLBmnkVpj3nfEU7T894F HQLmGQTdvN3gyMlrKRC4NfJzq5QWT0RthvX9DZkp+GIM5kjvIqMe5whaLi8t55gx3Ddk 4e+w== X-Gm-Message-State: AKS2vOwmCdsfZd1UgZyypNADuwB8vw3clo0lv6DVve70pkSDF9rRrYmD SC5+mbWHptABNu0m X-Received: by 10.223.141.173 with SMTP id o42mr166661wrb.110.1497440358620; Wed, 14 Jun 2017 04:39:18 -0700 (PDT) Received: from boken.gopro.lcl (73.136-14-84.ripe.coltfrance.com. [84.14.136.73]) by smtp.gmail.com with ESMTPSA id p139sm1329872wmg.14.2017.06.14.04.39.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 04:39:17 -0700 (PDT) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Jun 2017 13:39:12 +0200 Message-Id: <20170614113912.23045-1-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.13.1 Subject: [FFmpeg-devel] [PATCH] lavc/aarch64/simple_idct: fix build with Xcode 7.2 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: Matthieu Bouron MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/aarch64/simple_idct_neon.S | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/aarch64/simple_idct_neon.S b/libavcodec/aarch64/simple_idct_neon.S index 5bd31e5be9..5e4d021a97 100644 --- a/libavcodec/aarch64/simple_idct_neon.S +++ b/libavcodec/aarch64/simple_idct_neon.S @@ -92,10 +92,10 @@ endconst .endm .macro idct_row4_neon y1, y2, y3, y4, pass - ld1 {\y1\().2D-\y2\().2D}, [x2], #32 + ld1 {\y1\().2D,\y2\().2D}, [x2], #32 movi v23.4S, #1<<2, lsl #8 orr v5.16B, \y1\().16B, \y2\().16B - ld1 {\y3\().2D, \y4\().2D}, [x2], #32 + ld1 {\y3\().2D,\y4\().2D}, [x2], #32 orr v6.16B, \y3\().16B, \y4\().16B orr v5.16B, v5.16B, v6.16B mov x3, v5.D[1] @@ -104,7 +104,7 @@ endconst idct_col4_top \y1, \y2, \y3, \y4, 1, .4H cmp x3, #0 - beq \pass\()f + b.eq \pass\()f smull2 v7.4S, \y1\().8H, z4 smlal2 v17.4S, \y2\().8H, z5 @@ -169,7 +169,7 @@ function idct_col4_neon\i mov x4, v28.D[\i - 1] mov x5, v29.D[\i - 1] cmp x4, #0 - beq 1f + b.eq 1f smull\i v7.4S, v28\l, z4 add v19.4S, v19.4S, v7.4S @@ -179,7 +179,7 @@ function idct_col4_neon\i 1: mov x4, v30.D[\i - 1] cmp x5, #0 - beq 2f + b.eq 2f smlal\i v17.4S, v29\l, z5 smlsl\i v18.4S, v29\l, z1 @@ -188,7 +188,7 @@ function idct_col4_neon\i 2: mov x5, v31.D[\i - 1] cmp x4, #0 - beq 3f + b.eq 3f smull\i v7.4S, v30\l, z6 smull\i v16.4S, v30\l, z2 @@ -198,7 +198,7 @@ function idct_col4_neon\i add v21.4S, v21.4S, v16.4S 3: cmp x5, #0 - beq 4f + b.eq 4f smlal\i v17.4S, v31\l, z7 smlsl\i v18.4S, v31\l, z5 @@ -267,14 +267,14 @@ function ff_simple_idct_add_neon, export=1 idct_row4_neon v28, v29, v30, v31, 2 bl idct_col4_neon1 - sshr v1.8H, V7.8H, #COL_SHIFT-16 + sshr v1.8H, v7.8H, #COL_SHIFT-16 sshr v2.8H, v16.8H, #COL_SHIFT-16 sshr v3.8H, v17.8H, #COL_SHIFT-16 sshr v4.8H, v18.8H, #COL_SHIFT-16 bl idct_col4_neon2 - sshr v7.8H, V7.8H, #COL_SHIFT-16 + sshr v7.8H, v7.8H, #COL_SHIFT-16 sshr v16.8H, v16.8H, #COL_SHIFT-16 sshr v17.8H, v17.8H, #COL_SHIFT-16 sshr v18.8H, v18.8H, #COL_SHIFT-16 @@ -330,7 +330,7 @@ function ff_simple_idct_neon, export=1 mov x2, x0 idct_row4_neon v24, v25, v26, v27, 1 idct_row4_neon v28, v29, v30, v31, 2 - add x2, x2, #-128 + sub x2, x2, #128 bl idct_col4_neon1 sshr v1.8H, v7.8H, #COL_SHIFT-16 @@ -347,16 +347,16 @@ function ff_simple_idct_neon, export=1 zip1 v23.2D, v1.2D, v7.2D zip2 v24.2D, v1.2D, v7.2D - st1 {v23.2D,V24.2D}, [x2], #32 + st1 {v23.2D,v24.2D}, [x2], #32 zip1 v25.2D, v2.2D, v16.2D zip2 v26.2D, v2.2D, v16.2D - st1 {v25.2D,V26.2D}, [x2], #32 + st1 {v25.2D,v26.2D}, [x2], #32 zip1 v27.2D, v3.2D, v17.2D zip2 v28.2D, v3.2D, v17.2D - st1 {v27.2D,V28.2D}, [x2], #32 + st1 {v27.2D,v28.2D}, [x2], #32 zip1 v29.2D, v4.2D, v18.2D zip2 v30.2D, v4.2D, v18.2D - st1 {v29.2D,V30.2D}, [x2], #32 + st1 {v29.2D,v30.2D}, [x2], #32 idct_end endfunc