Fix x264 on AArch64. quant-a.S and deblock-a.S have syntax the LLVM
assembler complains about. Pull in two upstream changes to fix these until they are on the stable branch. Without these these ports fail to build on AArch64. Approved by: koobs Differential Revision: https://reviews.freebsd.org/D4781
This commit is contained in:
parent
353ad9c72e
commit
9813418ad5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=405243
20
multimedia/x264/files/patch-deblock-a.S
Normal file
20
multimedia/x264/files/patch-deblock-a.S
Normal file
@ -0,0 +1,20 @@
|
||||
--- common/aarch64/deblock-a.S.orig 2016-01-04 11:21:40.265233000 +0000
|
||||
+++ common/aarch64/deblock-a.S 2016-01-04 11:27:19.291080000 +0000
|
||||
@@ -538,7 +538,7 @@
|
||||
ret
|
||||
endfunc
|
||||
|
||||
-.macro h264_loop_filter_chroma_intra, width=16
|
||||
+.macro h264_loop_filter_chroma_intra width=16
|
||||
uabd v26.16b, v16.16b, v17.16b // abs(p0 - q0)
|
||||
uabd v27.16b, v18.16b, v16.16b // abs(p1 - p0)
|
||||
uabd v28.16b, v19.16b, v17.16b // abs(q1 - q0)
|
||||
@@ -604,7 +604,7 @@
|
||||
|
||||
transpose4x4.h v18, v16, v17, v19, v26, v27, v28, v29
|
||||
|
||||
- h264_loop_filter_chroma_intra, width=8
|
||||
+ h264_loop_filter_chroma_intra width=8
|
||||
|
||||
st2 {v16.h,v17.h}[0], [x0], x1
|
||||
st2 {v16.h,v17.h}[1], [x0], x1
|
24
multimedia/x264/files/patch-quant-a.S
Normal file
24
multimedia/x264/files/patch-quant-a.S
Normal file
@ -0,0 +1,24 @@
|
||||
--- common/aarch64/quant-a.S.orig 2016-01-04 11:28:55.378084000 +0000
|
||||
+++ common/aarch64/quant-a.S 2016-01-04 11:30:55.055050000 +0000
|
||||
@@ -546,12 +546,10 @@
|
||||
sub x0, x0, #2
|
||||
.endif
|
||||
.if \size < 15
|
||||
- .equ shiftw, 3
|
||||
ld1 {v0.8h}, [x0]
|
||||
uqxtn v0.8b, v0.8h
|
||||
cmtst v0.8b, v0.8b, v0.8b
|
||||
.else
|
||||
- .equ shiftw, 2
|
||||
ld1 {v0.8h,v1.8h}, [x0]
|
||||
uqxtn v0.8b, v0.8h
|
||||
uqxtn2 v0.16b, v1.8h
|
||||
@@ -565,7 +563,7 @@
|
||||
|
||||
coeff_level_run_start \size
|
||||
|
||||
- coeff_level_run shiftw
|
||||
+ coeff_level_run (4 - (\size + 1) / 8)
|
||||
|
||||
ret
|
||||
endfunc
|
Loading…
Reference in New Issue
Block a user