mirror of
https://github.com/jellyfin/jellyfin-ffmpeg.git
synced 2025-02-18 20:19:05 +00:00
Fix x86 mathops assembly build with newer binutil
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
parent
d4a65da0d7
commit
53d3b7d86b
60
debian/patches/0057-fix-x86-mathops-assembly-build-with-newer-binutil.patch
vendored
Normal file
60
debian/patches/0057-fix-x86-mathops-assembly-build-with-newer-binutil.patch
vendored
Normal file
@ -0,0 +1,60 @@
|
||||
Index: jellyfin-ffmpeg/libavcodec/x86/mathops.h
|
||||
===================================================================
|
||||
--- jellyfin-ffmpeg.orig/libavcodec/x86/mathops.h
|
||||
+++ jellyfin-ffmpeg/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;
|
||||
}
|
||||
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -54,3 +54,4 @@
|
||||
0054-add-vui-info-to-the-seq-header-of-hevc-vaapi-encoder.patch
|
||||
0055-use-contiguous-linear-vulkan-images-for-amd-encoder.patch
|
||||
0056-fix-libplacebo-filter-build-with-v6-api.patch
|
||||
0057-fix-x86-mathops-assembly-build-with-newer-binutil.patch
|
||||
|
Loading…
x
Reference in New Issue
Block a user