From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id EF8EA4BAC5
for <ffmpegdev@gitmailbox.com>; Fri, 2 May 2025 07:44:50 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 42E6368AEFE;
Fri, 2 May 2025 10:44:46 +0300 (EEST)
Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com
[209.85.210.175])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98CEB687B45
for <ffmpeg-devel@ffmpeg.org>; Fri, 2 May 2025 10:44:39 +0300 (EEST)
Received: by mail-pf1-f175.google.com with SMTP id
d2e1a72fcca58-7398d65476eso1469164b3a.1
for <ffmpeg-devel@ffmpeg.org>; Fri, 02 May 2025 00:44:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1746171877; x=1746776677; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=tY3hqiDfgRzIMHMDfaSISL1yGFkKAj+N4909bw7THpo=;
b=XNgjqh3ZR1azPGYchW64caXoCjTrlLjjizUYcycddkZhcIWSlcAs2IPHv5RGnCoGUR
WLk7IqSC63gFZePWRQtH5Dj/pWz9TNRhuX2mjEPPO8F7do7S4MukHqx7u9YdQfvcJrci
1gOFwprjQl+cCQ1+skgDxZ87FOyIZpHcPUmKYwzNmHvGhyyUGk0Zv4vu+XBbXZnVvM5X
aactzSm8aWWqpGjpWAalFF77HqmcGLG7R8zprGj9NcMAuoxetjMUN8zdXwcGYB0gZdl0
DwQAuWwL7ZoO8RsqdSnALFDAJE1V+f9isJehDj+YvUKRuxq96uoRt5/RZAsAlztFTI7W
sXGw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1746171877; x=1746776677;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=tY3hqiDfgRzIMHMDfaSISL1yGFkKAj+N4909bw7THpo=;
b=pmvg77Mh/U46efTGkMSP9LUT8iUVy8iW6h1X4/EVlHKYYkEB1vkCCzLFZ7frDauSFn
/3Rw/azzIn6KEJAV42ieFi4A8K1X04515COXy7QriVv+YFRdPmWoPxitb8/Pookn+cHJ
iSGbZMCxnAHVKckdYSzrFVvFpTjRIwIpmpmPQzAG7EkLWfHuR0fkfywm3N1vN6jR4/wH
3U2L2e9GuiGn/+Jw84ccVPcGyYjnOhQHCzfhpMXxgcL7OaqNT/gSLcFXKVyt8q5b0/QT
2MS0z2OdSb15e7/jAOiCj1SVzjQE1fO4Sl6dE+9uedI3Y38IHSBCPU8vwSR32PbK7CO6
N1Mg==
X-Gm-Message-State: AOJu0YxxOCc4LGor7muZ2SzX9YWWPwAQGP3qeNvpZ5irPq4FZk5o9J4b
C3a+Znh3NWOGGngFEXbDnU4iV2cEZ7WJ9qqFAYlCui9yODPq/2yvSh0aesWOQZM=
X-Gm-Gg: ASbGncuUc6il//qOQWxNzJOzKKS/jA8kVmXfSSM2JTMOtBsRkiflBuk1p6hLw8kpEWk
XK4vpQUBgXanAv6oCP2VvPl/Zq6LNwcyYtTPfnAuxo3sSmAnrtM4IbR18QhPlb1T4cNfiSyI9xb
gYOQ6+tGzAnD/HtXRawY596dJbWoN4avcKMiJ4pnD/yf9b6YsRB1l4puIm6/fbRLQfGF/8ids+E
/yLJa0Ug2GhgmLzmgYKUcuF7EeLOYtKcau02vj/gaffag0FYxSaPaY8k4qiT+tjKFkZblddqVK5
IyrT3wE/bnhzJ4R1jvJ+/VnF/CN0AuXein0=
X-Google-Smtp-Source: AGHT+IGP8XKwuVSlLPNcz0aX8Vf8v9KZmDPK7Wkor/spmWi2KyxWIMfIIj5a2ytK+AdjK8CoVEBLcQ==
X-Received: by 2002:a05:6a00:3003:b0:736:b400:b58f with SMTP id
d2e1a72fcca58-74048fcf549mr9189189b3a.0.1746171877170;
Fri, 02 May 2025 00:44:37 -0700 (PDT)
Received: from localhost ([112.65.11.72]) by smtp.gmail.com with ESMTPSA id
41be03b00d2f7-b1fb3b7afd4sm118561a12.33.2025.05.02.00.44.35
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 02 May 2025 00:44:36 -0700 (PDT)
From: Nuo Mi <nuomi2021@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Fri, 2 May 2025 15:44:26 +0800
Message-Id: <20250502074430.291561-1-nuomi2021@gmail.com>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 1/5] x86/vvcdec: misc,
reordered functions in dsp_init for improved readability
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Nuo Mi <nuomi2021@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250502074430.291561-1-nuomi2021@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavcodec/x86/vvc/dsp_init.c | 48 +++++++++++++++++++++--------------
1 file changed, 29 insertions(+), 19 deletions(-)
diff --git a/libavcodec/x86/vvc/dsp_init.c b/libavcodec/x86/vvc/dsp_init.c
index dc833bb0f1..bb68ba0b1e 100644
--- a/libavcodec/x86/vvc/dsp_init.c
+++ b/libavcodec/x86/vvc/dsp_init.c
@@ -215,6 +215,18 @@ ALF_FUNCS(16, 12, avx2)
#endif
+#define AVG_INIT(bd, opt) do { \
+ c->inter.avg = bf(vvc_avg, bd, opt); \
+ c->inter.w_avg = bf(vvc_w_avg, bd, opt); \
+} while (0)
+
+#define DMVR_INIT(bd) do { \
+ c->inter.dmvr[0][0] = ff_vvc_dmvr_##bd##_avx2; \
+ c->inter.dmvr[0][1] = ff_vvc_dmvr_h_##bd##_avx2; \
+ c->inter.dmvr[1][0] = ff_vvc_dmvr_v_##bd##_avx2; \
+ c->inter.dmvr[1][1] = ff_vvc_dmvr_hv_##bd##_avx2; \
+} while (0)
+
#define PEL_LINK(dst, C, W, idx1, idx2, name, D, opt) \
dst[C][W][idx1][idx2] = vvc_put_## name ## _ ## D ## _##opt; \
dst ## _uni[C][W][idx1][idx2] = ff_h2656_put_uni_ ## name ## _ ## D ## _##opt; \
@@ -280,17 +292,8 @@ ALF_FUNCS(16, 12, avx2)
MC_TAP_LINKS_16BPC_AVX2(LUMA, 8, bd); \
MC_TAP_LINKS_16BPC_AVX2(CHROMA, 4, bd);
-#define AVG_INIT(bd, opt) do { \
- c->inter.avg = bf(vvc_avg, bd, opt); \
- c->inter.w_avg = bf(vvc_w_avg, bd, opt); \
-} while (0)
-
-#define DMVR_INIT(bd) do { \
- c->inter.dmvr[0][0] = ff_vvc_dmvr_##bd##_avx2; \
- c->inter.dmvr[0][1] = ff_vvc_dmvr_h_##bd##_avx2; \
- c->inter.dmvr[1][0] = ff_vvc_dmvr_v_##bd##_avx2; \
- c->inter.dmvr[1][1] = ff_vvc_dmvr_hv_##bd##_avx2; \
-} while (0)
+int ff_vvc_sad_avx2(const int16_t *src0, const int16_t *src1, int dx, int dy, int block_w, int block_h);
+#define SAD_INIT() c->inter.sad = ff_vvc_sad_avx2
#define ALF_INIT(bd) do { \
c->alf.filter[LUMA] = vvc_alf_filter_luma_##bd##_avx2; \
@@ -298,8 +301,6 @@ ALF_FUNCS(16, 12, avx2)
c->alf.classify = vvc_alf_classify_##bd##_avx2; \
} while (0)
-int ff_vvc_sad_avx2(const int16_t *src0, const int16_t *src1, int dx, int dy, int block_w, int block_h);
-#define SAD_INIT() c->inter.sad = ff_vvc_sad_avx2
#endif
@@ -319,12 +320,15 @@ void ff_vvc_dsp_init_x86(VVCDSPContext *const c, const int bd)
#endif
#if HAVE_AVX2_EXTERNAL
if (EXTERNAL_AVX2_FAST(cpu_flags)) {
- ALF_INIT(8);
+ // inter
AVG_INIT(8, avx2);
+ DMVR_INIT(8);
MC_LINKS_AVX2(8);
OF_INIT(8);
- DMVR_INIT(8);
SAD_INIT();
+
+ // filter
+ ALF_INIT(8);
}
#endif
break;
@@ -336,13 +340,16 @@ void ff_vvc_dsp_init_x86(VVCDSPContext *const c, const int bd)
#endif
#if HAVE_AVX2_EXTERNAL
if (EXTERNAL_AVX2_FAST(cpu_flags)) {
- ALF_INIT(10);
+ // inter
AVG_INIT(10, avx2);
+ DMVR_INIT(10);
MC_LINKS_AVX2(10);
MC_LINKS_16BPC_AVX2(10);
OF_INIT(10);
- DMVR_INIT(10);
SAD_INIT();
+
+ // filter
+ ALF_INIT(10);
}
#endif
break;
@@ -354,13 +361,16 @@ void ff_vvc_dsp_init_x86(VVCDSPContext *const c, const int bd)
#endif
#if HAVE_AVX2_EXTERNAL
if (EXTERNAL_AVX2_FAST(cpu_flags)) {
- ALF_INIT(12);
+ // inter
AVG_INIT(12, avx2);
+ DMVR_INIT(12);
MC_LINKS_AVX2(12);
MC_LINKS_16BPC_AVX2(12);
OF_INIT(12);
- DMVR_INIT(12);
SAD_INIT();
+
+ // filter
+ ALF_INIT(12);
}
#endif
break;
--
2.34.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".