From patchwork Mon Jan 9 22:15:12 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: 2154 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp7257519vsb; Mon, 9 Jan 2017 14:21:41 -0800 (PST) X-Received: by 10.223.160.23 with SMTP id k23mr1049554wrk.117.1484000500941; Mon, 09 Jan 2017 14:21:40 -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 g20si9256326wrd.211.2017.01.09.14.21.40; Mon, 09 Jan 2017 14:21:40 -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 938F068A241; Tue, 10 Jan 2017 00:21:30 +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 F317268077C for ; Tue, 10 Jan 2017 00:21:28 +0200 (EET) Received: by mail-lf0-f65.google.com with SMTP id v186so6874068lfa.2 for ; Mon, 09 Jan 2017 14:21:36 -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=G6OZKsC6ZqC3YsGgGdn6Os0QEFHTlTjlys3ggLYp6vI=; b=QRrLb435ZbuM8RFNyIMd4RwfIAUo1zP6FORhs8XbmZE9TNdeBXQDcGvsdWZj5ki16H Q3wdu8f8IB9PJH8OLrBcrNWNzR0RUJhw0/ao/BC/a8h+k1XQ/4eRkmnPp/2aKhXoJaHi rA/8y6gkZ2nwTUOYHNsKxfxgsYKqPUHGTLzjuCm2iIxytTGPJNIl+FfByFwYcW00mc9l KWyo+TIToldpRMo8xoT3OWi7dcyMShHxIypfZ5pu7e1GM+aRrVZIQm15xLUzOtFMaVE0 Ehm37zScJRU/61fFU+SyXNTzsHHnMVFOqjqAmlEVumD9YN/0fad4bO1Hd84gdtcbNjmv L6eg== 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=G6OZKsC6ZqC3YsGgGdn6Os0QEFHTlTjlys3ggLYp6vI=; b=VE+LSswdkWm3P4LZrBHdhh14cjt/F/EWyu3i+GHPAVq/yLf7vlTMi83xlbgRtqZL/v VePvsZfVE+G+RIApt4zR+mGivznOt5zrecJxUhjA5NVJUye/3YX0bek8kApC/IJu9z9+ 1u7aFXneSHeDiDjeflJ9+wYbZoAwalhceJU+jD0dGVGUImveFHauktWbpbUrhbDVXXrs MQ3YK3YD1ChlexMaesJDP/YFOTwno7UUi9d5PQkleSLIXzQOtDNgMkhr/qEA4Qv1XreP nf1E2sI8sdPefRYFPqjyj1O2jurJbDhPHbcb1TQgI8GDKacUtek77wVGGxjaBgl7dr3T U/Ow== X-Gm-Message-State: AIkVDXLKWp7uWzGPnXozaD5lxaZ6wWf+j6V7micHbzbyHLN6IbISO1imgbv1nBSrqZlTMg== X-Received: by 10.25.77.83 with SMTP id a80mr3963258lfb.140.1484000125902; Mon, 09 Jan 2017 14:15:25 -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.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jan 2017 14:15:25 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Jan 2017 00:15:12 +0200 Message-Id: <1484000119-4959-6-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 06/13] arm: vp9itxfm: Rename a macro parameter to fit better 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" Since the same parameter is used for both input and output, the name inout is more fitting. This matches the naming used below in the dmbutterfly macro. This is cherrypicked from libav commit 79566ec8c77969d5f9be533de04b1349834cca62. --- libavcodec/arm/vp9itxfm_neon.S | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/arm/vp9itxfm_neon.S b/libavcodec/arm/vp9itxfm_neon.S index b4cc592..0097f5f 100644 --- a/libavcodec/arm/vp9itxfm_neon.S +++ b/libavcodec/arm/vp9itxfm_neon.S @@ -125,16 +125,16 @@ endconst vmlal.s16 \out4, \in4, \coef1 .endm -@ in1 = (in1 * coef1 - in2 * coef2 + (1 << 13)) >> 14 -@ in2 = (in1 * coef2 + in2 * coef1 + (1 << 13)) >> 14 -@ in are 2 d registers, tmp are 2 q registers -.macro mbutterfly in1, in2, coef1, coef2, tmp1, tmp2, neg=0 - mbutterfly_l \tmp1, \tmp2, \in1, \in2, \coef1, \coef2 +@ inout1 = (inout1 * coef1 - inout2 * coef2 + (1 << 13)) >> 14 +@ inout2 = (inout1 * coef2 + inout2 * coef1 + (1 << 13)) >> 14 +@ inout are 2 d registers, tmp are 2 q registers +.macro mbutterfly inout1, inout2, coef1, coef2, tmp1, tmp2, neg=0 + mbutterfly_l \tmp1, \tmp2, \inout1, \inout2, \coef1, \coef2 .if \neg > 0 vneg.s32 \tmp2, \tmp2 .endif - vrshrn.s32 \in1, \tmp1, #14 - vrshrn.s32 \in2, \tmp2, #14 + vrshrn.s32 \inout1, \tmp1, #14 + vrshrn.s32 \inout2, \tmp2, #14 .endm @ inout1,inout2 = (inout1,inout2 * coef1 - inout3,inout4 * coef2 + (1 << 13)) >> 14