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 ESMTPS id A5C1F4E49E for ; Sat, 3 May 2025 09:12:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D25468B407; Sat, 3 May 2025 12:12:50 +0300 (EEST) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88FAE687A8E for ; Sat, 3 May 2025 12:12:44 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-225477548e1so31413125ad.0 for ; Sat, 03 May 2025 02:12:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746263562; x=1746868362; 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=XZ1ZLh07gIS0Vp458B7J3I9hcxQC+pMuvcLM9aN2ILde+75Wm50/39C/oesOxzy/uB RKrFdjLpDnDU3Znj2ePYkSfBWnlKecpV2W/a4I/lu6vjv+fhIrIRU72kMZfT629OCueG 5iU9FKsdKmaUrhu5Tm8jNWo47eQWc38WgRI94vsQO+rIIRFfIPxiKvha/PFTu9W0hXb5 4MIy68O8kqGyOM0wKfmrLBa6lT2AoOMi967KkMOWnu6sq8klO2/w9oKRRVZcSo0HKBje zFQ8O+eWBA3W81DeaewiqX8ACeaapBwo6Mh1K7vNMzMRCMSqSQY4tq7FZt6rNmyh2SCG xRtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746263562; x=1746868362; 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=e1E1YKejUhmeH6kQSycMzP4LmrrfRxPeXX3kUor3/m+/XL4CThXGtlQ9wg8p5CDQOq ac9VaA+ECqMmsIUnjBJOM2GLWt9e2dxx2ZWzcdJKI/4u8scemuh+45J4etutM/qTtKN2 dZ/dOFSWvZOB2kaYJaJoJTLGHeY373cKT6at1JMTHJIFTusnr/J9PmMrKtgxoRFaSj82 trYn8RZ4ED8paIA9GurqSaTGfjaacDLMHgsyaEm1P0RK9jEEFdFxkcUdnR1F2kTjX+M+ hMpNm7lbHgOXuaAqRKsAjrkYHGWIYjxMZIjKiPJ6/UVGp02qRYGzWeF/Uw9BNaQDBRJI bPpQ== X-Gm-Message-State: AOJu0YyTLEMgkbF0CVa4EmqG4j3EO2vSl+ehhFKZvhmOpYJOp0uN3+tw aNuTVRQwMq9YaLqCHUb/mtX02fSfkeAzatB5BdnzpozohZX42PtAwcDiDezj X-Gm-Gg: ASbGnctf/Fkdz94BwvVM993o8qg7Wxiom9l6t5hYJksl/wM6u+dDCYG8P24g8RsoFmY zl8NNHJf9VCZV4AB6EWvhhP74tgqzXhPy8zgRQya7zK1qF65KSMIloJfy8zOVIuMzRDOrA11F6U EesozapDAOKPFyzJaM8SC0cmSvLGoE9ndjG4lwLrjbnMLGc/Pe2iuYJ7SkvihGDZqZTAhr/uqMR 2Jb1lB72mV4Qb7ZdzzXY1B2u4D9TgsH++h+PM+7H5pva3Aaa4cAZieQf3yMLnhKuhp3n4m9N7hT Ld5xZ8A0xzsJ8XjbxjioGmPQ6BRTGZ5l87IYmd7ZNW7jiw== X-Google-Smtp-Source: AGHT+IGUr4RKnmu0xHJc/7fUZ6Q8Z937LgogrEYKzGD+CI9YDNZMqWcQCEeIpntd31PzO6vf3xlsjg== X-Received: by 2002:a17:902:e952:b0:224:160d:3f54 with SMTP id d9443c01a7336-22e1ea3fe7fmr5167875ad.31.1746263562198; Sat, 03 May 2025 02:12:42 -0700 (PDT) Received: from localhost ([112.65.11.72]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15232723sm20263425ad.229.2025.05.03.02.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 May 2025 02:12:41 -0700 (PDT) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 May 2025 17:11:39 +0800 Message-Id: <20250503091145.76025-1-nuomi2021@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/7] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nuo Mi 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: --- 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".