diff options
author | Zhirui Dai | 2023-10-09 12:43:10 -0700 |
---|---|---|
committer | Zhirui Dai | 2023-10-09 12:43:10 -0700 |
commit | 2f6fc6fc9aac85f503cf2ad1a3eae26c23b280bb (patch) | |
tree | d969d0d6cdafdbaf1cdf819e553c0e3ed76391c6 | |
parent | 7e23c6871941fbad4d86e6236d518e4259c0eecc (diff) | |
download | aur-2f6fc6fc9aac85f503cf2ad1a3eae26c23b280bb.tar.gz |
6.0
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | libavcodec.patch | 57 |
2 files changed, 58 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0d096bb6b55a..d64a61cd45f3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ !.SRCINFO !add-av_stream_get_first_dts-for-chromium.patch !ffmpeg-vmaf2.x.patch +!libavcodec.patch diff --git a/libavcodec.patch b/libavcodec.patch new file mode 100644 index 000000000000..74b53486b51f --- /dev/null +++ b/libavcodec.patch @@ -0,0 +1,57 @@ +--- a/libavcodec/x86/mathops.h ++++ b/libavcodec/x86/mathops.h +@@ -35,12 +35,20 @@ + static av_always_inline av_const int MULL(int a, int b, unsigned shift) + { + int rt, dummy; ++ if (__builtin_constant_p(shift)) + __asm__ ( + "imull %3 \n\t" + "shrdl %4, %%edx, %%eax \n\t" + :"=a"(rt), "=d"(dummy) +- :"a"(a), "rm"(b), "ci"((uint8_t)shift) ++ :"a"(a), "rm"(b), "i"(shift & 0x1F) + ); ++ else ++ __asm__ ( ++ "imull %3 \n\t" ++ "shrdl %4, %%edx, %%eax \n\t" ++ :"=a"(rt), "=d"(dummy) ++ :"a"(a), "rm"(b), "c"((uint8_t)shift) ++ ); + return rt; + } + +@@ -113,19 +121,31 @@ __asm__ volatile(\ + // avoid +32 for shift optimization (gcc should do that ...) + #define NEG_SSR32 NEG_SSR32 + static inline int32_t NEG_SSR32( int32_t a, int8_t s){ ++ if (__builtin_constant_p(s)) + __asm__ ("sarl %1, %0\n\t" + : "+r" (a) +- : "ic" ((uint8_t)(-s)) ++ : "i" (-s & 0x1F) + ); ++ else ++ __asm__ ("sarl %1, %0\n\t" ++ : "+r" (a) ++ : "c" ((uint8_t)(-s)) ++ ); + return a; + } + + #define NEG_USR32 NEG_USR32 + static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ ++ if (__builtin_constant_p(s)) + __asm__ ("shrl %1, %0\n\t" + : "+r" (a) +- : "ic" ((uint8_t)(-s)) ++ : "i" (-s & 0x1F) + ); ++ else ++ __asm__ ("shrl %1, %0\n\t" ++ : "+r" (a) ++ : "c" ((uint8_t)(-s)) ++ ); + return a; + } |