From patchwork Fri Mar 30 19:14:23 2018 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: 8251 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp3217645jad; Fri, 30 Mar 2018 12:19:56 -0700 (PDT) X-Google-Smtp-Source: AIpwx49qrk2ZnlcBmyKmQuc985KzyJUmtMiVCB2U2vpKB1SiB8R+x8Y2fSh7Ejw0FTjrolIECgHr X-Received: by 10.28.157.68 with SMTP id g65mr3262164wme.31.1522437596767; Fri, 30 Mar 2018 12:19:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522437596; cv=none; d=google.com; s=arc-20160816; b=IH/j8eWVknx5TJUjxIMgLRkGXnl+3zkRSZ1u5EfmalHpwhchhI28dWBYBkvHtDOHlZ MSZTpxGeenNvsE9C5jHxQhYcMhgRoHtFC9MsupMjcg4XyxegLUCZvsJiFKfvoDzclgiB NLb22l8/Snl7Gk7+WwerGmto1DnbeE/jUwSEvgDV2kjIfAqVHx8xYhClH990d4dgvra9 zh4KeOatEbSyQajiViLYXVc713TwRZcNAHu3BnVRS31ZvTBnTSEorRTYC2+qHwdyzeTC lBG7zMt0ivkdfWWhpsCd5HfOVb3zeCf1nGvcZOSSbMiVUKaY9fyEgAef8RSrC04Z2qyj An/w== 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=QklbvPC7G64C1Ql0bQWdqnCyttRAnc7kiPDUVudBx9s=; b=a3OOgknRTmP4zkCPbNgVAdRH3W4DO/5b3XFGsYzEXjuDsWyGX250UFITmsVaMTB3x6 EgbeeQH86vBKc+V3SeIKmkNkiggQIAJOZYc8KDgH2arfvjzA65bfpOAeg053olpHRwD0 ioxpQJmqVooSaiJq0DL77xOfDCIeQeYKhFpjqzgtJ+4C6+jypgZfjyetqAjn9z1wF9wP XRIn7U9f8VncsxOZPUWwwwsMJQtKGQhgb1MfnaxncYYsabvcOE0Vef3Ne1HE93PXWriy fNVa9PHx7bBPISzckO0dBXU0BqzgT8Y/AYUP6Ct61EZ9QehdyyYI8tfpfccAxoyeVcKu RJqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20150623.gappssmtp.com header.s=20150623 header.b=nawag0Pi; 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 m130si3478063wmd.109.2018.03.30.12.19.56; Fri, 30 Mar 2018 12:19:56 -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=@martin-st.20150623.gappssmtp.com header.s=20150623 header.b=nawag0Pi; 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 F2162689C74; Fri, 30 Mar 2018 22:19:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62A15689BC3 for ; Fri, 30 Mar 2018 22:19:30 +0300 (EEST) Received: by mail-lf0-f68.google.com with SMTP id x70-v6so6804263lfa.0 for ; Fri, 30 Mar 2018 12:19:49 -0700 (PDT) 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=CT1MtkKRX/U9W5rjO0puOP7Vdo9E9lsV1Dxf457CFSs=; b=nawag0PiEvHFJTXwLq1N5WO7+ofEpkSmPRB2WpSgUC3FSU4yNYVqymf2Cj6XpDgeMR 2XmJyo4m3aLCEAtq4yss7abv4WP+HGfXJkAcP1/AxiTwTgo6rDMJ5tFo/vRrmxlewJo8 9OzQHKERO/JUoBx4iD/a/XlXPm1vhd8Bao1OOTOUTiBPPmm5HZINDRMalm8uNbkaRhyF AufNjGCvWyGWPDc7vO5xK1szimkbA5PPzDi10QtiFlYPWzQQkQIlp29M49tVHOsAIOy5 kZgFHuK2ohnlrQy/Ci9MejHJRI9bU4gYINTFXhGygWOnyabhPE+wPDlWwGJoWFjOrhpR PSiw== 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=CT1MtkKRX/U9W5rjO0puOP7Vdo9E9lsV1Dxf457CFSs=; b=rqr2kcq4L96nU/uWV0+ABd6s1x1JKHgZmnkw/SAGdqNjb2ieVItDdpSm/Vnj310hPS yjA78mwb6kUhXLPHpzfZJBvbJ/QYdws8kSaYO4nPksVT69Oll0dwPfZsaEZaBbCukuko KP2axuAxuZ5wIGAT5vc9l+VRGcG5u3zOWeNCqw2soTx2xHVt/IBHWPft7zrZGaFO37pX t3T4Ps/rqwxJ6JKi/V29xDkYGmaZ+xyONTn6URFXuvee00pvM7A2eFFGfdu1k71kRybG azWr0hY0V5L3eTPNGkDccB6FANOtz/2076O6x+mP8hRIMZo0Q4AEkFNYOJcHHfQYWKlX H09w== X-Gm-Message-State: ALQs6tDtv9e+uYbBBsA7xpMXYVFJpx6GhJ5Sc6n0AJwD6xs5tY3IlXh4 uDa7X7JM6OSnHp6c9ZGrA1/Jknci X-Received: by 2002:a19:181b:: with SMTP id o27-v6mr113433lfi.132.1522437267040; Fri, 30 Mar 2018 12:14:27 -0700 (PDT) Received: from localhost (host-97-36.parnet.fi. [77.234.97.36]) by smtp.gmail.com with ESMTPSA id d8sm1561959ljg.63.2018.03.30.12.14.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Mar 2018 12:14:26 -0700 (PDT) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Mar 2018 22:14:23 +0300 Message-Id: <20180330191423.3420-3-martin@martin.st> X-Mailer: git-send-email 2.15.1 (Apple Git-101) In-Reply-To: <20180330191423.3420-1-martin@martin.st> References: <20180330191423.3420-1-martin@martin.st> Subject: [FFmpeg-devel] [PATCH 3/3] arm: hevcdsp: Avoid using macro expansion counters 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" Clang supports the macro expansion counter (used for making unique labels within macro expansions), but not when targeting darwin. Convert uses of the counter into normal local labels, as used elsewhere. Since Xcode 9.3, the bundled clang supports altmacro and doesn't require using gas-preprocessor any longer. --- libavcodec/arm/hevcdsp_qpel_neon.S | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/arm/hevcdsp_qpel_neon.S b/libavcodec/arm/hevcdsp_qpel_neon.S index 86f92cf75a..caa6efa766 100644 --- a/libavcodec/arm/hevcdsp_qpel_neon.S +++ b/libavcodec/arm/hevcdsp_qpel_neon.S @@ -667,76 +667,76 @@ endfunc function ff_hevc_put_qpel_h1v1_neon_8, export=1 - hevc_put_qpel_hXvY_neon_8 qpel_filter_1 qpel_filter_1_32b + hevc_put_qpel_hXvY_neon_8 qpel_filter_1, qpel_filter_1_32b endfunc function ff_hevc_put_qpel_h2v1_neon_8, export=1 - hevc_put_qpel_hXvY_neon_8 qpel_filter_2 qpel_filter_1_32b + hevc_put_qpel_hXvY_neon_8 qpel_filter_2, qpel_filter_1_32b endfunc function ff_hevc_put_qpel_h3v1_neon_8, export=1 - hevc_put_qpel_hXvY_neon_8 qpel_filter_3 qpel_filter_1_32b + hevc_put_qpel_hXvY_neon_8 qpel_filter_3, qpel_filter_1_32b endfunc function ff_hevc_put_qpel_h1v2_neon_8, export=1 - hevc_put_qpel_hXvY_neon_8 qpel_filter_1 qpel_filter_2_32b + hevc_put_qpel_hXvY_neon_8 qpel_filter_1, qpel_filter_2_32b endfunc function ff_hevc_put_qpel_h2v2_neon_8, export=1 - hevc_put_qpel_hXvY_neon_8 qpel_filter_2 qpel_filter_2_32b + hevc_put_qpel_hXvY_neon_8 qpel_filter_2, qpel_filter_2_32b endfunc function ff_hevc_put_qpel_h3v2_neon_8, export=1 - hevc_put_qpel_hXvY_neon_8 qpel_filter_3 qpel_filter_2_32b + hevc_put_qpel_hXvY_neon_8 qpel_filter_3, qpel_filter_2_32b endfunc function ff_hevc_put_qpel_h1v3_neon_8, export=1 - hevc_put_qpel_hXvY_neon_8 qpel_filter_1 qpel_filter_3_32b + hevc_put_qpel_hXvY_neon_8 qpel_filter_1, qpel_filter_3_32b endfunc function ff_hevc_put_qpel_h2v3_neon_8, export=1 - hevc_put_qpel_hXvY_neon_8 qpel_filter_2 qpel_filter_3_32b + hevc_put_qpel_hXvY_neon_8 qpel_filter_2, qpel_filter_3_32b endfunc function ff_hevc_put_qpel_h3v3_neon_8, export=1 - hevc_put_qpel_hXvY_neon_8 qpel_filter_3 qpel_filter_3_32b + hevc_put_qpel_hXvY_neon_8 qpel_filter_3, qpel_filter_3_32b endfunc function ff_hevc_put_qpel_uw_h1v1_neon_8, export=1 - hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_1 qpel_filter_1_32b + hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_1, qpel_filter_1_32b endfunc function ff_hevc_put_qpel_uw_h2v1_neon_8, export=1 - hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_2 qpel_filter_1_32b + hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_2, qpel_filter_1_32b endfunc function ff_hevc_put_qpel_uw_h3v1_neon_8, export=1 - hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_3 qpel_filter_1_32b + hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_3, qpel_filter_1_32b endfunc function ff_hevc_put_qpel_uw_h1v2_neon_8, export=1 - hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_1 qpel_filter_2_32b + hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_1, qpel_filter_2_32b endfunc function ff_hevc_put_qpel_uw_h2v2_neon_8, export=1 - hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_2 qpel_filter_2_32b + hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_2, qpel_filter_2_32b endfunc function ff_hevc_put_qpel_uw_h3v2_neon_8, export=1 - hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_3 qpel_filter_2_32b + hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_3, qpel_filter_2_32b endfunc function ff_hevc_put_qpel_uw_h1v3_neon_8, export=1 - hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_1 qpel_filter_3_32b + hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_1, qpel_filter_3_32b endfunc function ff_hevc_put_qpel_uw_h2v3_neon_8, export=1 - hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_2 qpel_filter_3_32b + hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_2, qpel_filter_3_32b endfunc function ff_hevc_put_qpel_uw_h3v3_neon_8, export=1 - hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_3 qpel_filter_3_32b + hevc_put_qpel_uw_hXvY_neon_8 qpel_filter_3, qpel_filter_3_32b endfunc .macro init_put_pixels