This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 741e5630771c2e2068e3f6b4609ada28ca3d1de1 Author: Zhao Zhili <[email protected]> AuthorDate: Fri Jul 3 21:22:39 2026 +0800 Commit: Zhao Zhili <[email protected]> CommitDate: Wed Jul 8 03:37:41 2026 +0000 aarch64/h26x: parameterize calc_all step macro name So callers can pass a named step macro instead of relying on a locally redefined `calc` followed by `.purgem calc`. Signed-off-by: Zhao Zhili <[email protected]> --- libavcodec/aarch64/h26x/epel_neon.S | 40 ++++++++++++++++++------------------- libavcodec/aarch64/h26x/qpel_neon.S | 36 ++++++++++++++++----------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/libavcodec/aarch64/h26x/epel_neon.S b/libavcodec/aarch64/h26x/epel_neon.S index 22f58ba5fa..f28bd3faad 100644 --- a/libavcodec/aarch64/h26x/epel_neon.S +++ b/libavcodec/aarch64/h26x/epel_neon.S @@ -93,47 +93,47 @@ endconst sqshrn2 \dst\().8h, \tmp\().4s, #6 .endm -.macro calc_all4 - calc v16, v17, v18, v19 +.macro calc_all4 op=calc + \op v16, v17, v18, v19 b.eq 2f - calc v17, v18, v19, v16 + \op v17, v18, v19, v16 b.eq 2f - calc v18, v19, v16, v17 + \op v18, v19, v16, v17 b.eq 2f - calc v19, v16, v17, v18 + \op v19, v16, v17, v18 b.ne 1b .endm -.macro calc_all8 - calc v16, v17, v18, v19, v20, v21, v22, v23 +.macro calc_all8 op=calc + \op v16, v17, v18, v19, v20, v21, v22, v23 b.eq 2f - calc v18, v19, v20, v21, v22, v23, v16, v17 + \op v18, v19, v20, v21, v22, v23, v16, v17 b.eq 2f - calc v20, v21, v22, v23, v16, v17, v18, v19 + \op v20, v21, v22, v23, v16, v17, v18, v19 b.eq 2f - calc v22, v23, v16, v17, v18, v19, v20, v21 + \op v22, v23, v16, v17, v18, v19, v20, v21 b.ne 1b .endm -.macro calc_all12 - calc v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27 +.macro calc_all12 op=calc + \op v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27 b.eq 2f - calc v19, v20, v21, v22, v23, v24, v25, v26, v27, v16, v17, v18 + \op v19, v20, v21, v22, v23, v24, v25, v26, v27, v16, v17, v18 b.eq 2f - calc v22, v23, v24, v25, v26, v27, v16, v17, v18, v19, v20, v21 + \op v22, v23, v24, v25, v26, v27, v16, v17, v18, v19, v20, v21 b.eq 2f - calc v25, v26, v27, v16, v17, v18, v19, v20, v21, v22, v23, v24 + \op v25, v26, v27, v16, v17, v18, v19, v20, v21, v22, v23, v24 b.ne 1b .endm -.macro calc_all16 - calc v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31 +.macro calc_all16 op=calc + \op v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31 b.eq 2f - calc v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v16, v17, v18, v19 + \op v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v16, v17, v18, v19 b.eq 2f - calc v24, v25, v26, v27, v28, v29, v30, v31, v16, v17, v18, v19, v20, v21, v22, v23 + \op v24, v25, v26, v27, v28, v29, v30, v31, v16, v17, v18, v19, v20, v21, v22, v23 b.eq 2f - calc v28, v29, v30, v31, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27 + \op v28, v29, v30, v31, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27 b.ne 1b .endm diff --git a/libavcodec/aarch64/h26x/qpel_neon.S b/libavcodec/aarch64/h26x/qpel_neon.S index 53a8629363..cdd065c6bd 100644 --- a/libavcodec/aarch64/h26x/qpel_neon.S +++ b/libavcodec/aarch64/h26x/qpel_neon.S @@ -131,41 +131,41 @@ endconst .endif .endm -.macro calc_all - calc v23, v16, v17, v18, v19, v20, v21, v22, v23 +.macro calc_all op=calc + \op v23, v16, v17, v18, v19, v20, v21, v22, v23 b.eq 2f - calc v16, v17, v18, v19, v20, v21, v22, v23, v16 + \op v16, v17, v18, v19, v20, v21, v22, v23, v16 b.eq 2f - calc v17, v18, v19, v20, v21, v22, v23, v16, v17 + \op v17, v18, v19, v20, v21, v22, v23, v16, v17 b.eq 2f - calc v18, v19, v20, v21, v22, v23, v16, v17, v18 + \op v18, v19, v20, v21, v22, v23, v16, v17, v18 b.eq 2f - calc v19, v20, v21, v22, v23, v16, v17, v18, v19 + \op v19, v20, v21, v22, v23, v16, v17, v18, v19 b.eq 2f - calc v20, v21, v22, v23, v16, v17, v18, v19, v20 + \op v20, v21, v22, v23, v16, v17, v18, v19, v20 b.eq 2f - calc v21, v22, v23, v16, v17, v18, v19, v20, v21 + \op v21, v22, v23, v16, v17, v18, v19, v20, v21 b.eq 2f - calc v22, v23, v16, v17, v18, v19, v20, v21, v22 + \op v22, v23, v16, v17, v18, v19, v20, v21, v22 b.hi 1b .endm -.macro calc_all2 - calc v30, v31, v16, v18, v20, v22, v24, v26, v28, v30, v17, v19, v21, v23, v25, v27, v29, v31 +.macro calc_all2 op=calc + \op v30, v31, v16, v18, v20, v22, v24, v26, v28, v30, v17, v19, v21, v23, v25, v27, v29, v31 b.eq 2f - calc v16, v17, v18, v20, v22, v24, v26, v28, v30, v16, v19, v21, v23, v25, v27, v29, v31, v17 + \op v16, v17, v18, v20, v22, v24, v26, v28, v30, v16, v19, v21, v23, v25, v27, v29, v31, v17 b.eq 2f - calc v18, v19, v20, v22, v24, v26, v28, v30, v16, v18, v21, v23, v25, v27, v29, v31, v17, v19 + \op v18, v19, v20, v22, v24, v26, v28, v30, v16, v18, v21, v23, v25, v27, v29, v31, v17, v19 b.eq 2f - calc v20, v21, v22, v24, v26, v28, v30, v16, v18, v20, v23, v25, v27, v29, v31, v17, v19, v21 + \op v20, v21, v22, v24, v26, v28, v30, v16, v18, v20, v23, v25, v27, v29, v31, v17, v19, v21 b.eq 2f - calc v22, v23, v24, v26, v28, v30, v16, v18, v20, v22, v25, v27, v29, v31, v17, v19, v21, v23 + \op v22, v23, v24, v26, v28, v30, v16, v18, v20, v22, v25, v27, v29, v31, v17, v19, v21, v23 b.eq 2f - calc v24, v25, v26, v28, v30, v16, v18, v20, v22, v24, v27, v29, v31, v17, v19, v21, v23, v25 + \op v24, v25, v26, v28, v30, v16, v18, v20, v22, v24, v27, v29, v31, v17, v19, v21, v23, v25 b.eq 2f - calc v26, v27, v28, v30, v16, v18, v20, v22, v24, v26, v29, v31, v17, v19, v21, v23, v25, v27 + \op v26, v27, v28, v30, v16, v18, v20, v22, v24, v26, v29, v31, v17, v19, v21, v23, v25, v27 b.eq 2f - calc v28, v29, v30, v16, v18, v20, v22, v24, v26, v28, v31, v17, v19, v21, v23, v25, v27, v29 + \op v28, v29, v30, v16, v18, v20, v22, v24, v26, v28, v31, v17, v19, v21, v23, v25, v27, v29 b.hi 1b .endm _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
