123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657 |
- 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
- @@ -56,16 +56,18 @@
- (e.g. 2/3), and get rid of the rounding operations in the inner loop.
- The latter both reduces CPU time and makes the algorithm more SIMD-friendly.
- */
-
- #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);}
- #include "speex_resampler.h"
- #include "arch.h"
- #else /* OUTSIDE_SPEEX */
- @@ -632,25 +634,26 @@ static int update_filter(SpeexResamplerS
- st->oversample >>= 1;
- if (st->oversample < 1)
- st->oversample = 1;
- } else {
- /* up-sampling */
- st->cutoff = quality_map[st->quality].upsample_bandwidth;
- }
-
- - /* Choose the resampling type that requires the least amount of memory */
- -#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
- - use_direct = st->filt_len*st->den_rate <= st->filt_len*st->oversample+8
- + /* Choose the resampling type that requires the least amount of memory */
- + 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;
- -#endif
- 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)
- goto fail;
-
- min_sinc_table_length = st->filt_len*st->oversample+8;
|