From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D7C0948EDD for ; Wed, 29 May 2024 17:16:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F197368D552; Wed, 29 May 2024 20:16:34 +0300 (EEST) Received: from out203-205-221-173.mail.qq.com (out203-205-221-173.mail.qq.com [203.205.221.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBA8968D509 for ; Wed, 29 May 2024 20:16:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1717002972; bh=8IuY2C+lMRYiPh2nEDHaUMUFMF3+C49OohYTqm94fg4=; h=From:To:Cc:Subject:Date; b=UdH97oQjw2qqA0jE0ya74BwjKcDdIvHyOIF0KjXSDnngl6ZPtTEc5PxjQK+rz7IUn AuNyH/UolF9HTbqLvZcG/GBhP9o5RYpBTiTb5wLUZPIUFZkcGFy+Exp3uYRDukOoYS AOAO/2mwa0mMtX6g/OxUnL3lnzx8wOVeJ+gGt96s= Received: from localhost.localdomain ([42.86.114.86]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 40A88E50; Thu, 30 May 2024 01:16:10 +0800 X-QQ-mid: xmsmtpt1717002970t587spc42 Message-ID: X-QQ-XMAILINFO: MgQY1K25Ph0m0efdAkCIm4EJOgUs3HIDQCXk3nfrU2RsII89kPBg37mNdXrs1L oj5VMn09Wzh9wNvUm5mHeJAJ1GfGEJ4D6SncMGZ3om4X1JOtN2drXfyLVwb4Lpf7VLE9AeN5V/LH uGBO4RArXQSyVhi1Az1LbAmr/cwatx1EOg1+WzyNH4PIGIUeVTsj0XPCnWc8Rg9L13kQVm67bOhU cc5vtoSLyWAw7TUlKj0qkmqgb6UbZ8+PdAzKzXW944HFYKMIc65vYoz2lGkdvqY9J2Xv2BGPVfBY 2cGYdtJ1webjTASQj9BPUok0zfln7yTBpc7r2K3igaczun+VcS/DDhXZB/Wt48NhpAbAVv/uLCYN WRYNQoUneWKY4xpOtf6yrj6TrdCbwkhNihzfnvx6FtfPhpsT3SP4G5SmZEkAL8uP5c7ksZ8P3lDV k99XibVGHdgdGVJ8xSUWDX4vRq9NCr/eiWSptjx81NecBgZANIHVACTYzh03tRs4f1kMXdcABvJl rlwb2w7Pc6uZNv6/BLXe8l1gacOi/EW3yEYZRxH/q1xIlIhiuRt2LXAkciq5Sma+xxHBOmpKe2nK ygwxpg+Pmu9SlRzJisJdGV4ozUdb9X3RdVrqpGaB/rvADJ1pHkgPv+Eg+ugRMfaWAiEwQejTKcgi YyKrV9hh5S2fRWxmg01tpkDAl+0eY8jfZqchANBB4GxwrVqQ/VBTKH6U+mNhOAo6JVuWqGp77xpi 4Iw7zow+b0NFH3x0sxioa0bPuVSx+Y2JdFqJ1WXXK49FmG2O5Bm8Rwfi/N1xRLz2HjSeBRkpUQHh MEPr5220RhMtRCQfBHrg4DLFNGThUmFp89VHaBxUuA3mZRVuEx2O9S1oOUnmcJWkArYHB2cpXaGe +bFq/AHsL0DGmmxrBlH0qyH7ORs3BEZw== X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 May 2024 01:15:36 +0800 X-OQ-MSGID: <20240529171540.911099-1-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/5] lavc/vp9dsp: R-V V rename ff_avg to ff_vp9_avg 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: sunyuechi Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: sunyuechi Avoid potential naming conflicts --- libavcodec/riscv/vp9_mc_rvv.S | 4 ++-- libavcodec/riscv/vp9dsp.h | 4 ++-- libavcodec/riscv/vp9dsp_init.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S index 7811cd9928..7cb38ec94a 100644 --- a/libavcodec/riscv/vp9_mc_rvv.S +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -37,9 +37,9 @@ .endm .macro copy_avg len -func ff_avg\len\()_rvv, zve32x +func ff_vp9_avg\len\()_rvv, zve32x csrwi vxrm, 0 - vsetvlstatic8 \len t0 64 + vsetvlstatic8 \len, t0, 64 1: vle8.v v8, (a2) vle8.v v16, (a0) diff --git a/libavcodec/riscv/vp9dsp.h b/libavcodec/riscv/vp9dsp.h index 79330b4968..ff8431591c 100644 --- a/libavcodec/riscv/vp9dsp.h +++ b/libavcodec/riscv/vp9dsp.h @@ -138,11 +138,11 @@ void ff_avg_bilin_##SIZE##hv_rvv(uint8_t *dst, ptrdiff_t dststride, \ int h, int mx, int my); #define VP9_COPY_AVG_RISCV_RVV_FUNC(SIZE) \ -void ff_copy##SIZE##_rvv(uint8_t *dst, ptrdiff_t dststride, \ +void ff_vp9_copy##SIZE##_rvv(uint8_t *dst, ptrdiff_t dststride, \ const uint8_t *src, ptrdiff_t srcstride, \ int h, int mx, int my); \ \ -void ff_avg##SIZE##_rvv(uint8_t *dst, ptrdiff_t dststride, \ +void ff_vp9_avg##SIZE##_rvv(uint8_t *dst, ptrdiff_t dststride, \ const uint8_t *src, ptrdiff_t srcstride, \ int h, int mx, int my); diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index 6bfe23563a..454dcd963f 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -52,10 +52,10 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp) if (bpp == 8 && (flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128)) { #define init_fpel(idx1, sz) \ - dsp->mc[idx1][FILTER_8TAP_SMOOTH ][1][0][0] = ff_avg##sz##_rvv; \ - dsp->mc[idx1][FILTER_8TAP_REGULAR][1][0][0] = ff_avg##sz##_rvv; \ - dsp->mc[idx1][FILTER_8TAP_SHARP ][1][0][0] = ff_avg##sz##_rvv; \ - dsp->mc[idx1][FILTER_BILINEAR ][1][0][0] = ff_avg##sz##_rvv + dsp->mc[idx1][FILTER_8TAP_SMOOTH ][1][0][0] = ff_vp9_avg##sz##_rvv; \ + dsp->mc[idx1][FILTER_8TAP_REGULAR][1][0][0] = ff_vp9_avg##sz##_rvv; \ + dsp->mc[idx1][FILTER_8TAP_SHARP ][1][0][0] = ff_vp9_avg##sz##_rvv; \ + dsp->mc[idx1][FILTER_BILINEAR ][1][0][0] = ff_vp9_avg##sz##_rvv init_fpel(0, 64); init_fpel(1, 32); -- 2.45.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".