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 335384E474 for ; Sat, 3 May 2025 09:13:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90BDF68B7FA; Sat, 3 May 2025 12:13:37 +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 16317687D6D for ; Sat, 3 May 2025 12:13:35 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-739b3fe7ce8so2787262b3a.0 for ; Sat, 03 May 2025 02:13:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746263614; x=1746868414; 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=XvL1Kbz2HZzLeVFOHaXfklnPqE2cAPgWS1av192fUW4WW2E49Qts5EGCZ775SCO0pB VCLhomsAMZGpOo54/ymeMZ+d6YxhcoIya7AwJbWOFBCCDrLLCu6SOfSyRi16YPYUhedo 7Gw6DkDbgfdhtJ1I+dnXBbUfBZxNdBhDP0sCKd/OoQX4vPYo7BsqLNN6Tz87QBMa7wCR 2sky2l46ugF5YEt696Gj7JnSu9eqnwIYpqU3Mle2nSTsyLnqHqY8NjUfp4e+C1w0RpN6 99Tby5UpeXHjA5/5X43cJ1yY4p+ibEev24cYQXPzz6LoG4Z2NUNnhcTL0PfhI9fqpR33 TaIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746263614; x=1746868414; 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=Pk+0MuOwaYMuUwCzcnxkS/DQZfCDKQ+RSsLFiQRiTGYxaPD9RUGv/RhZXUcqAv4vSR UlSRyWUJpKc7G4ueRVWIAebQ6rRgzl4tPrHiV4t3XmNBfxV1RpNbpx/VjCqHYUm4qjMU BJgZBjGZAKUYnpZ8dYD8FjhQlkcnQrzVkVDzQKSeOHyhV+hXNoNCgnvKTJt6VncnceHX tn4YdzQJEXbvQkitx5z1lNRKi/luWL/r1vjwt4q7r/8sS2rfwpx7aNP96N4FkWAoDjDU BEmmbaibMapm7PBHFfVn7LXbgF1jl/ezsIoNagwkxZgAmNoDZimBTsGRS7tMqtMp6cm3 4fZQ== X-Gm-Message-State: AOJu0YyaJTmH8u7c5bo/NjHFFS9A7gZTMj9girWCJb8FZlJ2lN6pyZol uqQx874Jav8D+Wds4lpOeG4H2BYQ5M6/oYUkqvOBdww79+qzvNMtNdmLKKjp X-Gm-Gg: ASbGncvnYxfvryM80ECfVf7YZ9dXBx8OkYtl6NrzDbLO+5hYdZRFGyEeJU7thxoj50d AZhUEKuxxbQka2rndpe/OGuH26IDPRP1CuIX1BVOLQuWdbF7Yofukt8plUJ9RSpqVgHQNCKrkcp LFWTIec5UQPIMe42wd4h8Q9tjkLkIg5TfwR691/OTzo9hhvWUNd0mi2uLY//6YrzA1tvdkBu8fK NYwGhjZ8ukRwFX8eg9B56rJMcSncYe6LcZeTAp6kuoTnzxSoQS2/yrQKBmT/iOs7V0hkUGsSPSb OasJ98kW57ojpMeDfvR8T7btwc9KqKSWk/g= X-Google-Smtp-Source: AGHT+IE3h2KrMTdh6wRv0BDgGZwdoGGSoeAksYfaCrTIpElWH5mR1a57txrjhpvL9395LfLUoVVzcA== X-Received: by 2002:a05:6a00:ad87:b0:736:a540:c9ad with SMTP id d2e1a72fcca58-74067422e2cmr3565475b3a.20.1746263613813; Sat, 03 May 2025 02:13:33 -0700 (PDT) Received: from localhost ([112.65.11.72]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058db9200sm2936927b3a.42.2025.05.03.02.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 May 2025 02:13:33 -0700 (PDT) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 May 2025 17:13:13 +0800 Message-Id: <20250503091319.76948-1-nuomi2021@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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".