From patchwork Fri Mar 17 13:18:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 2987 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp261415vsy; Fri, 17 Mar 2017 06:26:39 -0700 (PDT) X-Received: by 10.28.141.193 with SMTP id p184mr2920137wmd.122.1489757199838; Fri, 17 Mar 2017 06:26:39 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 137si3262501wmb.51.2017.03.17.06.26.39; Fri, 17 Mar 2017 06:26:39 -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; 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 0FD49688356; Fri, 17 Mar 2017 15:26:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C54EC68826D for ; Fri, 17 Mar 2017 15:26:13 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id u132so3288727wmg.1 for ; Fri, 17 Mar 2017 06:26:31 -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=o7Y7GZe0npA6xIga4FjdqmThwq9//Tn3gSU/QVcGYRw=; b=Ck5Gu+MIBQXNcpgGhqk7j6GXqXg0xMyFIKN2H1nrczFkZSFpUc07tK3bcXhoz4LJiT VhlyeW8b8t4DgvLToqLN0756yrVT9qiDJkboPH4dLLFDk0zwPJfMjtFHlG1u+BJhrYHp TB8rRM14WazVARYbVh7SdrH5XVS2C2ps7TGVVRGNVlVtfZ7A8jiIg/9eGrB2dPgEYDft YQUOLZDZttbh7qfeFjDyQXJX4+2ozKTy9oG7xnQVZcCZ3Nn3za5BAdbvfg/BNyHVgT4y /E6ZEEgfV3a74DEl7ZeG4ctzz07KLWbM5htbOTnytDbPPrIe1KV0lxilHHGcI2PTDyMi koeA== 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=o7Y7GZe0npA6xIga4FjdqmThwq9//Tn3gSU/QVcGYRw=; b=B0GnryQV9djR/GyP/kxmTqBIkz2kwz7Ud/RlbomOJCLXkxs7litqAnkZjftlq0dCOQ cvojQAL6kO4DVkBUQ8TwfV7wz4hHoU6JRHT8ySkGFrQjQBN77z9UA06knqz2ZWCfT+QR nAik+1w2LUKQDr+fWs2lV7o7h2TsVdiXCBBujkbXGnC2lwNqGJnE0MHoG3x0/KaVk3jR YldxDYezHLxGGUkqTOjhyvDe/f6yDuX+Isb6siJGOz4AYfdhjJXVFhnGPHaze+mCKs8F La1w1ED/XDgI863ABhX6bniniTdo/FbvJwkOnn/pCPwB/Sl6rD+O8orvMXJ+ibwokTZR Y6+g== X-Gm-Message-State: AFeK/H0saxAQlYTciN7n9MXa0G5ewHSMTo8W1VA73nR9enuJFiPAQuejiEOC207knOcMMQ== X-Received: by 10.28.107.13 with SMTP id g13mr2899403wmc.105.1489756766294; Fri, 17 Mar 2017 06:19:26 -0700 (PDT) Received: from localhost.localdomain (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id e72sm2676411wma.5.2017.03.17.06.19.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 06:19:25 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Fri, 17 Mar 2017 14:18:37 +0100 Message-Id: <20170317131845.7760-3-jdarnley@obe.tv> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20170317131845.7760-1-jdarnley@obe.tv> References: <20170317131845.7760-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 02/10] avcodec/h264: change some labels to be macro-local 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" --- libavcodec/x86/h264_idct.asm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm index 878ff02..dde40e9 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -846,7 +846,7 @@ h264_add8x4_idct_sse2: %macro add16_sse2_cycle 2 movzx r0, word [r4+%2] test r0, r0 - jz .cycle%1end + jz %%skip mov r0d, dword [r1+%1*8] %if ARCH_X86_64 add r0, r5 @@ -854,7 +854,7 @@ h264_add8x4_idct_sse2: add r0, r0m %endif call h264_add8x4_idct_sse2 -.cycle%1end: +%%skip: %if %1 < 7 add r2, 64 %endif @@ -883,7 +883,7 @@ REP_RET %macro add16intra_sse2_cycle 2 movzx r0, word [r4+%2] test r0, r0 - jz .try%1dc + jz %%trydc mov r0d, dword [r1+%1*8] %if ARCH_X86_64 add r0, r7 @@ -891,11 +891,11 @@ REP_RET add r0, r0m %endif call h264_add8x4_idct_sse2 - jmp .cycle%1end -.try%1dc: + jmp %%skip +%%trydc: movsx r0, word [r2 ] or r0w, word [r2+32] - jz .cycle%1end + jz %%skip mov r0d, dword [r1+%1*8] %if ARCH_X86_64 add r0, r7 @@ -903,7 +903,7 @@ REP_RET add r0, r0m %endif call h264_idct_dc_add8_mmxext -.cycle%1end: +%%skip: %if %1 < 7 add r2, 64 %endif @@ -930,7 +930,7 @@ REP_RET %macro add8_sse2_cycle 2 movzx r0, word [r4+%2] test r0, r0 - jz .try%1dc + jz %%trydc %if ARCH_X86_64 mov r0d, dword [r1+(%1&1)*8+64*(1+(%1>>1))] add r0, [r7] @@ -940,11 +940,11 @@ REP_RET add r0, dword [r1+(%1&1)*8+64*(1+(%1>>1))] %endif call h264_add8x4_idct_sse2 - jmp .cycle%1end -.try%1dc: + jmp %%cycle_end +%%trydc: movsx r0, word [r2 ] or r0w, word [r2+32] - jz .cycle%1end + jz %%cycle_end %if ARCH_X86_64 mov r0d, dword [r1+(%1&1)*8+64*(1+(%1>>1))] add r0, [r7] @@ -954,7 +954,7 @@ REP_RET add r0, dword [r1+(%1&1)*8+64*(1+(%1>>1))] %endif call h264_idct_dc_add8_mmxext -.cycle%1end: +%%cycle_end: %if %1 == 1 add r2, 384+64 %elif %1 < 3