From patchwork Thu Jun 15 13:34:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3985 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp807128vsw; Thu, 15 Jun 2017 06:48:47 -0700 (PDT) X-Received: by 10.28.113.200 with SMTP id d69mr3779185wmi.106.1497534527157; Thu, 15 Jun 2017 06:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497534527; cv=none; d=google.com; s=arc-20160816; b=R3Q2egPPqX9+fw4eL0EscqQIc0Jk3ecIWgbbYUL5WPevZEVBaivUee7GJbqbbwhbb9 /skkMaAiRBmiLN2rTj6LfeWwEjKEKVuljqL8sPoEH4yYf4f34lREKRmLjJ5rRIq3Q+4t LMzsudAEZCAfrdKDG3AHsVvONG3M3xP2EgkfDOAVyZ7KN7vaygIi26QxDeNnQ38Qc0tG aySZMxeK80I+KJUU9lxWPpkdgacsJTG5vSQCmKpOE6psQBWBKAqznj4B1Zuhk/zOa0Ga MVNs/GNH5dFVu54JkYgvDpl19MFIUrcjhQz2QPJB4d4iyZbo6miNt92ZmqDICjN5Bkri U7JQ== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=YOov/ns4WFLqp5WhKgA07+NkQ5zCzHjUQlATD9e7HAQ=; b=kpIZVo48b78gz7w2SyNv6PrwpJ5tno2fCnCyF9PsxWxuUzguBaICSz+7iNj37Fsi5M 8fDHsnJfydkbL5QiZQwlEipKhmEu03C7nsSQ7Mdyzx1MIGsuF8zan6FodCUD9E05/KYY qBXNUi8S4eXoIeV89A8QW4V9K9jA9kkEPxq/HiMuWI+welq4jvZx4FiwMjgQkdVYuIp+ 6bIcOxaDz6gbFE0q84QFh90Ekmy1WiNsukEn+UkMDpYNNVv/hfIG3JEDx70GL66UYn/n YG7WPZkFOmPUy23dJA1vmqNO1M2mD/MTL/JZ/qncVluVVHwn/GpTJXl2AYWXMDwgqeX/ CJ+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.b=O1VHJs+O; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i12si203240wmg.60.2017.06.15.06.48.46; Thu, 15 Jun 2017 06:48:47 -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=@ob-encoder-com.20150623.gappssmtp.com header.b=O1VHJs+O; 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 B142D68A344; Thu, 15 Jun 2017 16:48:33 +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 70A3268A33A for ; Thu, 15 Jun 2017 16:48:27 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id z45so3858411wrb.2 for ; Thu, 15 Jun 2017 06:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=MYsHv8pGXfEFX7kWBZmDBunwJM2h4ttQnLhM/bnJdgU=; b=O1VHJs+ODXSWo1b4PrBteIranUsLWKxs/cqcJsvqMM45yq3N73pj5n9OIvjearJ4no tYG9SVslTkYf+92Ssx4NcAM+86jR8REa+ueP5SPFwrValAiqihaPfe9UWTTkqHgRKApI ghaka161ZANup4gogXopYs+Xr2k8MPIB9WevSu59N7zhTf4P8wlj5MZCDcw9erF9KVAF JQxbQe5aiJdYg1yBZJmiICODnsCSojHkFRYAioQYWjmCsv5wll9wpdXg1OauJQCHzIGh z7Sj9J+lRIBtt2q+dkT/rqrYaZr203C4CxBWvJZjj7Z1NS1p8kx5Ti6xPU3GkGex4D/1 BG2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=MYsHv8pGXfEFX7kWBZmDBunwJM2h4ttQnLhM/bnJdgU=; b=dcDnbnclelS3ax+C8SokndGUW4BHaYz0wSj2QuYMtuQacGcbXuBi+41HBMOAxwO3ih zl1L/aVgt+c7d2SETCY2q6k0nTabUouOcD6NSCBMN5VdR/SS4IogrZoDR5y/i1wy18+0 suWGYfNu5T9R3589+5ezE2KVfwh+AMDqyxd6pUEzKeDOA5utD0INv+V6qTcB9Opz/xt8 jpLtOVWKgxhxAi++qz+skAoGK4ZXKCPOJIAeY66ibrz4OZnaE3eOuTSsQSYFEocUQDAu lcofkHSeYGuOsNPo8QrXxa/VzMTmvfPA9pQrIeWLVOmWM5Dgep907EK/uXKNj+VvSQWd CxQA== X-Gm-Message-State: AKS2vOzC/MnBAnXh0nF8Vkph7gPS6T3zeqSW0cGA2+5rn0AaZ+DKS2YE djz6gGSg/ArEpkN7ako= X-Received: by 10.223.130.110 with SMTP id 101mr669417wrb.21.1497534052764; Thu, 15 Jun 2017 06:40:52 -0700 (PDT) Received: from Ifrit.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id c55sm211027wrc.7.2017.06.15.06.40.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 06:40:52 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Thu, 15 Jun 2017 15:34:22 +0200 Message-Id: <20170615133426.4484-3-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170615133426.4484-1-jdarnley@obe.tv> References: <20170615133426.4484-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/x86: cleanup simple_idct10 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" Use named arguments for the functions so we can remove a define. The stride/linesize argument is now ptrdiff_t type so we no longer need to sign extend the register. --- libavcodec/x86/proresdsp.asm | 2 +- libavcodec/x86/simple_idct10.asm | 8 ++-- libavcodec/x86/simple_idct10_template.asm | 80 ++++++++++++++----------------- 3 files changed, 41 insertions(+), 49 deletions(-) diff --git a/libavcodec/x86/proresdsp.asm b/libavcodec/x86/proresdsp.asm index 16fc262aeb..8318a81c5e 100644 --- a/libavcodec/x86/proresdsp.asm +++ b/libavcodec/x86/proresdsp.asm @@ -51,7 +51,7 @@ cextern w7_min_w5 SECTION .text %macro idct_fn 0 -cglobal prores_idct_put_10, 4, 4, 15 +cglobal prores_idct_put_10, 4, 4, 15, pixels, lsize, block, qmat IDCT_FN pw_1, 15, pw_88, 18, pw_4, pw_1019, r3 RET %endmacro diff --git a/libavcodec/x86/simple_idct10.asm b/libavcodec/x86/simple_idct10.asm index 5dee533de0..7cfd33eaa3 100644 --- a/libavcodec/x86/simple_idct10.asm +++ b/libavcodec/x86/simple_idct10.asm @@ -68,21 +68,21 @@ CONST_DEC w7_min_w5, W7sh2, -W5sh2 SECTION .text %macro idct_fn 0 -cglobal simple_idct10, 1, 1, 16 +cglobal simple_idct10, 1, 1, 16, block IDCT_FN "", 12, "", 19 RET -cglobal simple_idct10_put, 3, 3, 16 +cglobal simple_idct10_put, 3, 3, 16, pixels, lsize, block IDCT_FN "", 12, "", 19, 0, pw_1023 RET -cglobal simple_idct12, 1, 1, 16 +cglobal simple_idct12, 1, 1, 16, block ; coeffs are already 15bits, adding the offset would cause ; overflow in the input IDCT_FN "", 15, pw_2, 16 RET -cglobal simple_idct12_put, 3, 3, 16 +cglobal simple_idct12_put, 3, 3, 16, pixels, lsize, block ; range isn't known, so the C simple_idct range is used ; Also, using a bias on input overflows, so use the bias ; on output of the first butterfly instead diff --git a/libavcodec/x86/simple_idct10_template.asm b/libavcodec/x86/simple_idct10_template.asm index 9d323d99b3..3f398985a5 100644 --- a/libavcodec/x86/simple_idct10_template.asm +++ b/libavcodec/x86/simple_idct10_template.asm @@ -115,18 +115,18 @@ psubd m3, m9 ; a1[4-7] intermediate ; load/store - mova [COEFFS+ 0], m0 - mova [COEFFS+ 32], m2 - mova [COEFFS+ 64], m4 - mova [COEFFS+ 96], m6 - mova m10,[COEFFS+ 16] ; { row[1] }[0-7] - mova m8, [COEFFS+ 48] ; { row[3] }[0-7] - mova m13,[COEFFS+ 80] ; { row[5] }[0-7] - mova m14,[COEFFS+112] ; { row[7] }[0-7] - mova [COEFFS+ 16], m1 - mova [COEFFS+ 48], m3 - mova [COEFFS+ 80], m5 - mova [COEFFS+112], m7 + mova [blockq+ 0], m0 + mova [blockq+ 32], m2 + mova [blockq+ 64], m4 + mova [blockq+ 96], m6 + mova m10,[blockq+ 16] ; { row[1] }[0-7] + mova m8, [blockq+ 48] ; { row[3] }[0-7] + mova m13,[blockq+ 80] ; { row[5] }[0-7] + mova m14,[blockq+112] ; { row[7] }[0-7] + mova [blockq+ 16], m1 + mova [blockq+ 48], m3 + mova [blockq+ 80], m5 + mova [blockq+112], m7 %if %0 == 3 pmullw m10,[%3+ 16] pmullw m8, [%3+ 48] @@ -197,17 +197,17 @@ ; row[5] = (a2 - b2) >> 15; ; row[3] = (a3 + b3) >> 15; ; row[4] = (a3 - b3) >> 15; - mova m8, [COEFFS+ 0] ; a0[0-3] - mova m9, [COEFFS+16] ; a0[4-7] + mova m8, [blockq+ 0] ; a0[0-3] + mova m9, [blockq+16] ; a0[4-7] SUMSUB_SHPK m8, m9, m10, m11, m0, m1, %2 - mova m0, [COEFFS+32] ; a1[0-3] - mova m1, [COEFFS+48] ; a1[4-7] + mova m0, [blockq+32] ; a1[0-3] + mova m1, [blockq+48] ; a1[4-7] SUMSUB_SHPK m0, m1, m9, m11, m2, m3, %2 - mova m1, [COEFFS+64] ; a2[0-3] - mova m2, [COEFFS+80] ; a2[4-7] + mova m1, [blockq+64] ; a2[0-3] + mova m2, [blockq+80] ; a2[4-7] SUMSUB_SHPK m1, m2, m11, m3, m4, m5, %2 - mova m2, [COEFFS+96] ; a3[0-3] - mova m3, [COEFFS+112] ; a3[4-7] + mova m2, [blockq+96] ; a3[0-3] + mova m3, [blockq+112] ; a3[4-7] SUMSUB_SHPK m2, m3, m4, m5, m6, m7, %2 %endmacro @@ -223,20 +223,12 @@ ; %7 = qmat (for prores) %macro IDCT_FN 4-7 -%if %0 == 4 - ; No clamping, means pure idct -%xdefine COEFFS r0 -%else - movsxd r1, r1d -%xdefine COEFFS r2 -%endif - ; for (i = 0; i < 8; i++) ; idctRowCondDC(block + i*8); - mova m10,[COEFFS+ 0] ; { row[0] }[0-7] - mova m8, [COEFFS+32] ; { row[2] }[0-7] - mova m13,[COEFFS+64] ; { row[4] }[0-7] - mova m12,[COEFFS+96] ; { row[6] }[0-7] + mova m10,[blockq+ 0] ; { row[0] }[0-7] + mova m8, [blockq+32] ; { row[2] }[0-7] + mova m13,[blockq+64] ; { row[4] }[0-7] + mova m12,[blockq+96] ; { row[6] }[0-7] %if %0 == 7 pmullw m10,[%7+ 0] @@ -251,10 +243,10 @@ ; transpose for second part of IDCT TRANSPOSE8x8W 8, 0, 1, 2, 4, 11, 9, 10, 3 - mova [COEFFS+ 16], m0 - mova [COEFFS+ 48], m2 - mova [COEFFS+ 80], m11 - mova [COEFFS+112], m10 + mova [blockq+ 16], m0 + mova [blockq+ 48], m2 + mova [blockq+ 80], m11 + mova [blockq+112], m10 SWAP 8, 10 SWAP 1, 8 SWAP 4, 13 @@ -267,14 +259,14 @@ ; clip/store %if %0 == 4 ; No clamping, means pure idct - mova [r0+ 0], m8 - mova [r0+ 16], m0 - mova [r0+ 32], m1 - mova [r0+ 48], m2 - mova [r0+ 64], m4 - mova [r0+ 80], m11 - mova [r0+ 96], m9 - mova [r0+112], m10 + mova [blockq+ 0], m8 + mova [blockq+ 16], m0 + mova [blockq+ 32], m1 + mova [blockq+ 48], m2 + mova [blockq+ 64], m4 + mova [blockq+ 80], m11 + mova [blockq+ 96], m9 + mova [blockq+112], m10 %else %ifidn %5, 0 pxor m3, m3