Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=1000044 use direct resampler for 16->44.1k r=jmspeex

Browse Source 
This also changes the HUGEMEM test to be independent of quality.
|oversample| has a maximum value of 32, so we know that the interpolating
resampler will use less memory when st->den_rate > 441.

--HG--
extra : transplant_source : vl%C1d%A5%FB%3Cd%FBC%86%FD%26%EC%FB%C0%5C%26%7D%8C
This commit is contained in:
Karl Tomlinson 2014-07-24 09:44:59 +12:00
parent 5c4bd64854
commit 922ba93d0c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
media/libspeex_resampler/hugemem.patch
View File

@ -20,7 +20,8 @@ diff --git a/media/libspeex_resampler/src/resample.c b/media/libspeex_resampler/
#include "speex_resampler.h"
#include "arch.h"
#else /* OUTSIDE_SPEEX */
@@ -633,24 +635,23 @@ static int update_filter(SpeexResamplerS
@@ -632,25 +634,26 @@ static int update_filter(SpeexResamplerS
st->oversample >>= 1;
if (st->oversample < 1)
st->oversample = 1;
} else {
@ -28,17 +29,20 @@ diff --git a/media/libspeex_resampler/src/resample.c b/media/libspeex_resampler/
st->cutoff = quality_map[st->quality].upsample_bandwidth;
}
/* Choose the resampling type that requires the least amount of memory */
- /* 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
+ st->den_rate <= 16*(st->oversample+8)
+ /* 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
+ 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

8
media/libspeex_resampler/src/resample.c
View File

@ -639,12 +639,14 @@ static int update_filter(SpeexResamplerState *st)
st->cutoff = quality_map[st->quality].upsample_bandwidth;
}
/* Choose the resampling type that requires the least amount of memory */
use_direct =
#ifdef RESAMPLE_HUGEMEM
st->den_rate <= 16*(st->oversample+8)
/* Choose the direct resampler, even with higher initialization costs,
when resampling any multiple of 100 to 44100. */
st->den_rate <= 441
#else
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;
if (use_direct)