-
Notifications
You must be signed in to change notification settings - Fork 895
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Return the ffmpeg patch to fix memory usage (#22981)
- Loading branch information
Showing
2 changed files
with
63 additions
and
0 deletions.
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,37 @@ | ||
| diff --git a/libavutil/tx_template.c b/libavutil/tx_template.c | ||
| index a2c27465cbcabe242325f4126b74b4aa53f1aae8..c6cf1c2ddb3ca9a84ed344748ba560a5647edac8 100644 | ||
| --- a/libavutil/tx_template.c | ||
| +++ b/libavutil/tx_template.c | ||
| @@ -43,10 +43,6 @@ | ||
| SR_TABLE(32768) \ | ||
| SR_TABLE(65536) \ | ||
| SR_TABLE(131072) \ | ||
| - SR_TABLE(262144) \ | ||
| - SR_TABLE(524288) \ | ||
| - SR_TABLE(1048576) \ | ||
| - SR_TABLE(2097152) \ | ||
|
|
||
| #define SR_TABLE(len) \ | ||
| TABLE_DEF(len, len/4 + 1); | ||
| @@ -722,10 +718,6 @@ DECL_SR_CODELET(16384,8192,4096) | ||
| DECL_SR_CODELET(32768,16384,8192) | ||
| DECL_SR_CODELET(65536,32768,16384) | ||
| DECL_SR_CODELET(131072,65536,32768) | ||
| -DECL_SR_CODELET(262144,131072,65536) | ||
| -DECL_SR_CODELET(524288,262144,131072) | ||
| -DECL_SR_CODELET(1048576,524288,262144) | ||
| -DECL_SR_CODELET(2097152,1048576,524288) | ||
|
|
||
| static av_cold int TX_NAME(ff_tx_fft_init)(AVTXContext *s, | ||
| const FFTXCodelet *cd, | ||
| @@ -2158,10 +2150,6 @@ const FFTXCodelet * const TX_NAME(ff_tx_codelet_list)[] = { | ||
| &TX_NAME(ff_tx_fft32768_ns_def), | ||
| &TX_NAME(ff_tx_fft65536_ns_def), | ||
| &TX_NAME(ff_tx_fft131072_ns_def), | ||
| - &TX_NAME(ff_tx_fft262144_ns_def), | ||
| - &TX_NAME(ff_tx_fft524288_ns_def), | ||
| - &TX_NAME(ff_tx_fft1048576_ns_def), | ||
| - &TX_NAME(ff_tx_fft2097152_ns_def), | ||
|
|
||
| /* Prime factor codelets */ | ||
| &TX_NAME(ff_tx_fft3_ns_def), |
26 changes: 26 additions & 0 deletions
26
patches/third_party/ffmpeg/libavutil-x86-tx_float.asm.patch
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,26 @@ | ||
| diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm | ||
| index 42006848f1280bde3a5dd4d83d5c8776286f5ba0..e1533a85954d9156fcd0bba084f4f7ce3b5be451 100644 | ||
| --- a/libavutil/x86/tx_float.asm | ||
| +++ b/libavutil/x86/tx_float.asm | ||
| @@ -46,7 +46,7 @@ | ||
| %endif | ||
|
|
||
| %assign i 16 | ||
| -%rep 18 | ||
| +%rep 14 | ||
| cextern tab_ %+ i %+ _float ; ff_tab_i_float... | ||
| %assign i (i << 1) | ||
| %endrep | ||
| @@ -1385,11 +1385,7 @@ FFT_SPLIT_RADIX_DEF 8192, .16384pt | ||
| FFT_SPLIT_RADIX_DEF 16384, .32768pt | ||
| FFT_SPLIT_RADIX_DEF 32768, .65536pt | ||
| FFT_SPLIT_RADIX_DEF 65536, .131072pt | ||
| -FFT_SPLIT_RADIX_DEF 131072, .262144pt | ||
| -FFT_SPLIT_RADIX_DEF 262144, .524288pt | ||
| -FFT_SPLIT_RADIX_DEF 524288, .1048576pt | ||
| -FFT_SPLIT_RADIX_DEF 1048576, .2097152pt | ||
| -FFT_SPLIT_RADIX_DEF 2097152 | ||
| +FFT_SPLIT_RADIX_DEF 131072 | ||
|
|
||
| ;=============================================================================== | ||
| ; Final synthesis + deinterleaving code |