From patchwork Mon Sep 13 11:48:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 30208 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3921886iov; Mon, 13 Sep 2021 04:50:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzv1kZB6ILbZAeYlJBPgHMlYI3bO9wwF6jbt91+opqxXHeIzXCTtx1nJpImhTKbHi8otVCq X-Received: by 2002:a17:906:16d4:: with SMTP id t20mr763320ejd.482.1631533838141; Mon, 13 Sep 2021 04:50:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631533838; cv=none; d=google.com; s=arc-20160816; b=cl3VIKk/eSCPQUIVR4Mm86Fps7Eg8ec6+P1JiRYiBdcEfs+uMcdxxjvU8csMUrrDHy w6UBVJ9rwRlfzLmEZsoFk2521ZaoUi/CJcJ/MpnT1ukelLRHDhjOHjfnQL1kz4S2mDUO NBeCeqotmkxbiouwDmMe5p7ZYDncr8TbUsXqTzzSm5QCsZzsNdvePjtESSjdz45781zB tNMvIqfe6QPXJpAFTlrzZ9JMpVPCWEIMLhvmPKDyTvcvo/NRRZtAtXAzmgVwXbPl2va/ qalhGM5OCOgm7GXn+U74KXddMHTWgcscpoWj5JOmlMzCDVu/CMOssdh5oWrAQXELJHMx hWWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=VHi+6R2vJ3nV1mjOQnFxPtg6j78ir8TM5QaBlmfaAjs=; b=Hg4RMhT5OdftueWw08ny4ev7vzuUsROZcE+RBWslpk0wHprNghzl6FihAqqg/VLMdi 3aUCpRRyjQPqczC9M6LmuR/vH335T0Z8t9/a6DSsRmmgzUcOLZDZABwI28mNeVQJAVGb 2vrYlIrfpWtAg+l5elzD/avr5UCv9/SgE+GIlFHQegkbl5xL3bfD1aDO6BTwYDmFbVsx +rVk6E0S+8eQzCgKcBZdr/bStr+QEtXe7K7bopgls0gwJOxKvOpj6B2PLN8qZwrKZ/hu LnLXFGFBusExAUhj2wU67r9Mj7idR0mf32ObLk1OyrJZ9KW4VwOe21YrnqCa0SLVhMRW 8B9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="kWNSL/9H"; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z16si6238569edd.193.2021.09.13.04.50.37; Mon, 13 Sep 2021 04:50:38 -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=@foxmail.com header.s=s201512 header.b="kWNSL/9H"; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B2A268ACA5; Mon, 13 Sep 2021 14:50:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-205.mail.qq.com (out203-205-221-205.mail.qq.com [203.205.221.205]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF79E68AC54 for ; Mon, 13 Sep 2021 14:50:27 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1631533823; bh=LrK0Y1T2cPBKU685MOzzwj3i+WCiIZrC4lqdmBISNEs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kWNSL/9HefcrZBqNvqbuK2T3zgB2J4kXJYuhiH/D19s4oYixNFzWIy1AXiDTgEEpp pds+tzTEDypriLGBuJEteguKWim1SeofagkHn1Y2nFEhepcyMqtALzltfQlhzwYmee sllGRsbMW7TwRhQ3Z6vjbFnUhXgu2ClfB93ff6MY= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.58]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id C419901F; Mon, 13 Sep 2021 19:49:01 +0800 X-QQ-mid: xmsmtpt1631533741txkps3nu3 Message-ID: X-QQ-XMAILINFO: Nip6yC9MT+XlKSQwmLynnMnTCW3F+bQtMwreiGhabKSLwcY/4NwT37APhR3rlm 0f7U2/Nvgo9gesiKtesWJxpG0+B91PINatEV5PQ7deMEt+pQuBe7/uUpC7jacVENhYqBNQtllKQi yejgDXV3NeZVgBaUD2+vk1K2gULGgzf+04u5Y2o9l4xdDx1C/RfrRi4sa1m23GBXhVedDlOeaGIQ 8hFdc/h2rcwHIosaxtgLHQmqTYfejmlsTR9esGxzjZiUtdVZAUi8fyS6w6T2fkTmknSSZX64Flku eGagFpMvxpA4QbUb26HpX6E4NTzWj+PuZFpq1CjHmhIcMorn0/xc9H1ZtFfxuCSVahDEDQA4C/jk LyDS5viR/u7P2N8Y6fWqkx6PvMAZaEHjuf/jgn9Tc7Roems0dXX7VJwEgVC9ZQqup4ppZWG3zPnl wtwyv+igyhXQu3WOLklooZJOHuuRO78Dx67Q/oUUxIwX5sWwDTExgoXI1ptLSGD0MIQgcG/q1rKX CXWFkTQDxYZAmr4Mkq4TE8QwTBM3cgnrGwr7FQewijuL6skd2uovAR/piHkey4LgRGacmGNirRat iFVLt8uk7MtVCVSQkjK7hIE3qjKctiJOgBVaEPfLr7qYSttb7ovC4Kbn9oFW/+OzId0hQXcElpxF xYhhBcfa3pCZOeJIeZbw18ABswR1CpjTnnes/+D6vYeGsov2dkdLXr27hUxHnsIaI/DuNsQ4Mw5X PjS+iHGRiQP00JoB5fUvP5J9slHvvBQHVe4FixpoIH5/hK4Rkd6T7ERzsMEOw9pWUTuzFnAiyfRV oGbwMWmgSkWsRvujpFI1YC72/hZZJ21BFH1pYqhW2UJw== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Sep 2021 19:48:59 +0800 X-OQ-MSGID: <20210913114859.50215-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <6a376c63-ede5-29e8-fb56-c79acb3d900@martin.st> References: <6a376c63-ede5-29e8-fb56-c79acb3d900@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] swresample/aarch64: fix relocation out of range error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1LF4HY67UBcX From: Zhao Zhili --- v2: add local labels instead of changing the code libswresample/aarch64/audio_convert_neon.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libswresample/aarch64/audio_convert_neon.S b/libswresample/aarch64/audio_convert_neon.S index 74feff448a..6d789b16d2 100644 --- a/libswresample/aarch64/audio_convert_neon.S +++ b/libswresample/aarch64/audio_convert_neon.S @@ -23,6 +23,7 @@ #include "libavutil/aarch64/asm.S" function swri_oldapi_conv_flt_to_s16_neon, export=1 +oldapi_conv_flt_to_s16_neon: subs x2, x2, #8 ld1 {v0.4s}, [x1], #16 fcvtzs v4.4s, v0.4s, #31 @@ -67,6 +68,7 @@ function swri_oldapi_conv_flt_to_s16_neon, export=1 endfunc function swri_oldapi_conv_fltp_to_s16_2ch_neon, export=1 +oldapi_conv_fltp_to_s16_2ch_neon: ldp x4, x5, [x1] subs x2, x2, #8 ld1 {v0.4s}, [x4], #16 @@ -131,10 +133,10 @@ endfunc function swri_oldapi_conv_fltp_to_s16_nch_neon, export=1 cmp w3, #2 - b.eq X(swri_oldapi_conv_fltp_to_s16_2ch_neon) + b.eq oldapi_conv_fltp_to_s16_2ch_neon b.gt 1f ldr x1, [x1] - b X(swri_oldapi_conv_flt_to_s16_neon) + b oldapi_conv_flt_to_s16_neon 1: cmp w3, #4 lsl x12, x3, #1