mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
diff --git a/media/libspeex_resampler/src/resample.c b/media/libspeex_resampler/src/resample.c
|
|
--- a/media/libspeex_resampler/src/resample.c
|
|
+++ b/media/libspeex_resampler/src/resample.c
|
|
@@ -59,10 +59,12 @@
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
+#define RESAMPLE_HUGEMEM 1
|
|
+
|
|
#ifdef OUTSIDE_SPEEX
|
|
#include <stdlib.h>
|
|
static void *speex_alloc(int size) {return calloc(size,1);}
|
|
static void *speex_realloc(void *ptr, int size) {return realloc(ptr, size);}
|
|
static void speex_free(void *ptr) {free(ptr);}
|
|
@@ -646,19 +648,20 @@
|
|
} else {
|
|
/* up-sampling */
|
|
st->cutoff = quality_map[st->quality].upsample_bandwidth;
|
|
}
|
|
|
|
-#ifdef RESAMPLE_FULL_SINC_TABLE
|
|
- use_direct = 1;
|
|
- if (INT_MAX/sizeof(spx_word16_t)/st->den_rate < st->filt_len)
|
|
- goto fail;
|
|
+ use_direct =
|
|
+#ifdef RESAMPLE_HUGEMEM
|
|
+ /* Choose the direct resampler, even with higher initialization costs,
|
|
+ when resampling any multiple of 100 to 44100. */
|
|
+ st->den_rate <= 441
|
|
#else
|
|
/* Choose the resampling type that requires the least amount of memory */
|
|
- use_direct = st->filt_len*st->den_rate <= st->filt_len*st->oversample+8
|
|
- && INT_MAX/sizeof(spx_word16_t)/st->den_rate >= st->filt_len;
|
|
+ st->filt_len*st->den_rate <= st->filt_len*st->oversample+8
|
|
#endif
|
|
+ && INT_MAX/sizeof(spx_word16_t)/st->den_rate >= st->filt_len;
|
|
if (use_direct)
|
|
{
|
|
min_sinc_table_length = st->filt_len*st->den_rate;
|
|
} else {
|
|
if ((INT_MAX/sizeof(spx_word16_t)-8)/st->oversample < st->filt_len)
|