Update runtime to 46 #104
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| From: Rémi Denis-Courmont <remi@remlab.net> | ||
| Date: Sun, 16 Jul 2023 15:18:02 +0000 (+0300) | ||
| Subject: avcodec/x86/mathops: clip constants used with shift instructions within inline assembly | ||
| X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=effadce6c756247ea8bae32dc13bb3e6f464f0eb | ||
|
|
||
| avcodec/x86/mathops: clip constants used with shift instructions within inline assembly | ||
|
|
||
| Fixes assembling with binutil as >= 2.41 | ||
|
|
||
| Signed-off-by: James Almer <jamrial@gmail.com> | ||
| --- | ||
|
|
||
| diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h | ||
| index 6298f5ed19..ca7e2dffc1 100644 | ||
| --- 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; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,17 @@ | ||
| { | ||
| "name": "gssdp", | ||
| "buildsystem": "meson", | ||
| "config-opts" : [ | ||
| "-Dexamples=false", | ||
| "-Dmanpages=false", | ||
| "-Dgtk_doc=false" | ||
| ], | ||
| "sources": [ | ||
| { | ||
| "type": "git", | ||
| "url": "https://gitlab.gnome.org/GNOME/gssdp.git", | ||
| "commit": "c2d417d6a79f03c095e5730efd60015eb3109a82", | ||
| "tag": "gssdp-1.6.2" | ||
|
There was a problem hiding this comment. Please squash this into the "DLNA" modules update. |
||
| } | ||
| ] | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule shared-modules
updated
36 files
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's fine. Can you please file an issue to update to a newer ffmpeg major version against:
https://github.com/flathub/org.gnome.Totem.Devel/issues
You can reference this commit:
https://lwn.net/Articles/992496/