har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: Check the build time constants in av_clip_*intp2

Browse Source 
This fixes building for arm targets with optimizations disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2022-08-26 11:26:32 +03:00
parent 3f456dc245
commit 0dd8fe6f4b
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavutil/arm/intmath.h
View File

@ -65,17 +65,29 @@ static av_always_inline av_const int av_clip_int16_arm(int a)
#define av_clip_intp2 av_clip_intp2_arm #define av_clip_intp2 av_clip_intp2_arm
static av_always_inline av_const int av_clip_intp2_arm(int a, int p) static av_always_inline av_const int av_clip_intp2_arm(int a, int p)
{ {
unsigned x; if (av_builtin_constant_p(p)) {
__asm__ ("ssat %0, %2, %1" : "=r"(x) : "r"(a), "i"(p+1)); unsigned x;
return x; __asm__ ("ssat %0, %2, %1" : "=r"(x) : "r"(a), "i"(p+1));
return x;
} else {
if (((unsigned)a + (1 << p)) & ~((2 << p) - 1))
return (a >> 31) ^ ((1 << p) - 1);
else
return a;
}
} }
#define av_clip_uintp2 av_clip_uintp2_arm #define av_clip_uintp2 av_clip_uintp2_arm
static av_always_inline av_const unsigned av_clip_uintp2_arm(int a, int p) static av_always_inline av_const unsigned av_clip_uintp2_arm(int a, int p)
{ {
unsigned x; if (av_builtin_constant_p(p)) {
__asm__ ("usat %0, %2, %1" : "=r"(x) : "r"(a), "i"(p)); unsigned x;
return x; __asm__ ("usat %0, %2, %1" : "=r"(x) : "r"(a), "i"(p));
return x;
} else {
if (a & ~((1<<p) - 1)) return (~a) >> 31 & ((1<<p) - 1);
else return a;
}
} }
#define av_sat_add32 av_sat_add32_arm #define av_sat_add32 av_sat_add32_arm