Skip to content

Commit b9d57a5

Browse files
committed
contrib: update x265 to rev 12716 with additional arm64 optimizations. Disable scanPosLast aarch64 asm routine because of issues on Apple Silicon.
1 parent 7f89028 commit b9d57a5

File tree

5 files changed

+35
-8
lines changed

5 files changed

+35
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 17d8878491e6f634d85b95aca971d62718823e17 Mon Sep 17 00:00:00 2001
2+
From: Damiano galassi <[email protected]>
3+
Date: Sat, 9 Jul 2022 10:02:05 +0200
4+
Subject: [PATCH] Disable scanPosLast aarch64 asm because it can led to a crash
5+
on Apple Silicon.
6+
7+
---
8+
source/common/aarch64/asm-primitives.cpp | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/source/common/aarch64/asm-primitives.cpp b/source/common/aarch64/asm-primitives.cpp
12+
index 0e10dae2f..ae0f0a9ec 100644
13+
--- a/source/common/aarch64/asm-primitives.cpp
14+
+++ b/source/common/aarch64/asm-primitives.cpp
15+
@@ -663,7 +663,7 @@ void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask)
16+
p.cu[BLOCK_4x4].psy_cost_pp = PFX(psyCost_4x4_neon);
17+
18+
p.weight_pp = PFX(weight_pp_neon);
19+
- p.scanPosLast = PFX(scanPosLast_neon);
20+
+ //p.scanPosLast = PFX(scanPosLast_neon);
21+
#endif
22+
23+
// quant
24+
--
25+
2.32.1 (Apple Git-133)
26+

contrib/x265/module.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ __deps__ := X265_8 X265_10 X265_12
22
$(eval $(call import.MODULE.defs,X265,x265,$(__deps__)))
33
$(eval $(call import.CONTRIB.defs,X265))
44

5-
X265.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20220209-12707.tar.gz
6-
X265.FETCH.sha256 = ef09012449f535d2399ab489dfe094e91dc49fda3e847017f9830dd3233fc44f
5+
X265.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20220709-12716.tar.gz
6+
X265.FETCH.sha256 = 19ef8b21301f13d795601184884859e9f4a2f87fcda83757bd7dcd588056e926
77

88
# Silence "warning: overriding recipe for target" messages
99
X265.FETCH.target =

contrib/x265_10bit/module.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ __deps__ := X265_8
22
$(eval $(call import.MODULE.defs,X265_10,x265_10,$(__deps__),x265))
33
$(eval $(call import.CONTRIB.defs,X265_10))
44

5-
X265_10.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20220209-12707.tar.gz
6-
X265_10.FETCH.sha256 = ef09012449f535d2399ab489dfe094e91dc49fda3e847017f9830dd3233fc44f
5+
X265_10.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20220709-12716.tar.gz
6+
X265_10.FETCH.sha256 = 19ef8b21301f13d795601184884859e9f4a2f87fcda83757bd7dcd588056e926
77

88
# Silence "warning: overriding recipe for target" messages
99
X265_10.FETCH.target =

contrib/x265_12bit/module.defs

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ __deps__ := X265_8
22
$(eval $(call import.MODULE.defs,X265_12,x265_12,$(__deps__),x265))
33
$(eval $(call import.CONTRIB.defs,X265_12))
44

5-
X265_12.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20220209-12707.tar.gz
6-
X265_12.FETCH.sha256 = ef09012449f535d2399ab489dfe094e91dc49fda3e847017f9830dd3233fc44f
5+
X265_12.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20220709-12716.tar.gz
6+
X265_12.FETCH.sha256 = 19ef8b21301f13d795601184884859e9f4a2f87fcda83757bd7dcd588056e926
7+
78
# Silence "warning: overriding recipe for target" messages
89
X265_12.FETCH.target =
910

contrib/x265_8bit/module.defs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ __deps__ :=
22
$(eval $(call import.MODULE.defs,X265_8,x265_8,$(__deps__),x265))
33
$(eval $(call import.CONTRIB.defs,X265_8))
44

5-
X265_8.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20220209-12707.tar.gz
6-
X265_8.FETCH.sha256 = ef09012449f535d2399ab489dfe094e91dc49fda3e847017f9830dd3233fc44f
5+
X265_8.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20220709-12716.tar.gz
6+
X265_8.FETCH.sha256 = 19ef8b21301f13d795601184884859e9f4a2f87fcda83757bd7dcd588056e926
77

88
X265_8.build_dir = 8bit
99
X265_8.CONFIGURE.exe = cmake

0 commit comments

Comments
 (0)