swresample/resample: do not allow odd filter_length
except filter_length == 1 odd filter_length gives worse frequency response, even when compared with shorter filter_length also makes build_filter simpler Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
This commit is contained in:
parent
3016e919d4
commit
53a5cea478
|
@ -155,6 +155,8 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap
|
||||||
if (!tab || !sin_lut)
|
if (!tab || !sin_lut)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
|
av_assert0(tap_count == 1 || tap_count % 2 == 0);
|
||||||
|
|
||||||
/* if upsampling, only need to interpolate, no filter */
|
/* if upsampling, only need to interpolate, no filter */
|
||||||
if (factor > 1.0)
|
if (factor > 1.0)
|
||||||
factor = 1.0;
|
factor = 1.0;
|
||||||
|
@ -165,7 +167,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap
|
||||||
}
|
}
|
||||||
for(ph = 0; ph < ph_nb; ph++) {
|
for(ph = 0; ph < ph_nb; ph++) {
|
||||||
s = sin_lut[ph];
|
s = sin_lut[ph];
|
||||||
for(i=0;i<=tap_count;i++) {
|
for(i=0;i<tap_count;i++) {
|
||||||
x = M_PI * ((double)(i - center) - (double)ph / phase_count) * factor;
|
x = M_PI * ((double)(i - center) - (double)ph / phase_count) * factor;
|
||||||
if (x == 0) y = 1.0;
|
if (x == 0) y = 1.0;
|
||||||
else if (factor == 1.0)
|
else if (factor == 1.0)
|
||||||
|
@ -194,7 +196,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap
|
||||||
|
|
||||||
tab[i] = y;
|
tab[i] = y;
|
||||||
s = -s;
|
s = -s;
|
||||||
if (!ph && i < tap_count)
|
if (!ph)
|
||||||
norm += y;
|
norm += y;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -204,55 +206,29 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap
|
||||||
for(i=0;i<tap_count;i++)
|
for(i=0;i<tap_count;i++)
|
||||||
((int16_t*)filter)[ph * alloc + i] = av_clip_int16(lrintf(tab[i] * scale / norm));
|
((int16_t*)filter)[ph * alloc + i] = av_clip_int16(lrintf(tab[i] * scale / norm));
|
||||||
if (phase_count % 2) break;
|
if (phase_count % 2) break;
|
||||||
if (tap_count % 2 == 0 || tap_count == 1) {
|
for (i = 0; i < tap_count; i++)
|
||||||
for (i = 0; i < tap_count; i++)
|
((int16_t*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((int16_t*)filter)[ph * alloc + i];
|
||||||
((int16_t*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((int16_t*)filter)[ph * alloc + i];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
for (i = 1; i <= tap_count; i++)
|
|
||||||
((int16_t*)filter)[(phase_count-ph) * alloc + tap_count-i] =
|
|
||||||
av_clip_int16(lrintf(tab[i] * scale / norm));
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case AV_SAMPLE_FMT_S32P:
|
case AV_SAMPLE_FMT_S32P:
|
||||||
for(i=0;i<tap_count;i++)
|
for(i=0;i<tap_count;i++)
|
||||||
((int32_t*)filter)[ph * alloc + i] = av_clipl_int32(llrint(tab[i] * scale / norm));
|
((int32_t*)filter)[ph * alloc + i] = av_clipl_int32(llrint(tab[i] * scale / norm));
|
||||||
if (phase_count % 2) break;
|
if (phase_count % 2) break;
|
||||||
if (tap_count % 2 == 0 || tap_count == 1) {
|
for (i = 0; i < tap_count; i++)
|
||||||
for (i = 0; i < tap_count; i++)
|
((int32_t*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((int32_t*)filter)[ph * alloc + i];
|
||||||
((int32_t*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((int32_t*)filter)[ph * alloc + i];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
for (i = 1; i <= tap_count; i++)
|
|
||||||
((int32_t*)filter)[(phase_count-ph) * alloc + tap_count-i] =
|
|
||||||
av_clipl_int32(llrint(tab[i] * scale / norm));
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case AV_SAMPLE_FMT_FLTP:
|
case AV_SAMPLE_FMT_FLTP:
|
||||||
for(i=0;i<tap_count;i++)
|
for(i=0;i<tap_count;i++)
|
||||||
((float*)filter)[ph * alloc + i] = tab[i] * scale / norm;
|
((float*)filter)[ph * alloc + i] = tab[i] * scale / norm;
|
||||||
if (phase_count % 2) break;
|
if (phase_count % 2) break;
|
||||||
if (tap_count % 2 == 0 || tap_count == 1) {
|
for (i = 0; i < tap_count; i++)
|
||||||
for (i = 0; i < tap_count; i++)
|
((float*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((float*)filter)[ph * alloc + i];
|
||||||
((float*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((float*)filter)[ph * alloc + i];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
for (i = 1; i <= tap_count; i++)
|
|
||||||
((float*)filter)[(phase_count-ph) * alloc + tap_count-i] = tab[i] * scale / norm;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case AV_SAMPLE_FMT_DBLP:
|
case AV_SAMPLE_FMT_DBLP:
|
||||||
for(i=0;i<tap_count;i++)
|
for(i=0;i<tap_count;i++)
|
||||||
((double*)filter)[ph * alloc + i] = tab[i] * scale / norm;
|
((double*)filter)[ph * alloc + i] = tab[i] * scale / norm;
|
||||||
if (phase_count % 2) break;
|
if (phase_count % 2) break;
|
||||||
if (tap_count % 2 == 0 || tap_count == 1) {
|
for (i = 0; i < tap_count; i++)
|
||||||
for (i = 0; i < tap_count; i++)
|
((double*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((double*)filter)[ph * alloc + i];
|
||||||
((double*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((double*)filter)[ph * alloc + i];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
for (i = 1; i <= tap_count; i++)
|
|
||||||
((double*)filter)[(phase_count-ph) * alloc + tap_count-i] = tab[i] * scale / norm;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -308,6 +284,10 @@ static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_r
|
||||||
double factor= FFMIN(out_rate * cutoff / in_rate, 1.0);
|
double factor= FFMIN(out_rate * cutoff / in_rate, 1.0);
|
||||||
int phase_count= 1<<phase_shift;
|
int phase_count= 1<<phase_shift;
|
||||||
int phase_count_compensation = phase_count;
|
int phase_count_compensation = phase_count;
|
||||||
|
int filter_length = FFMAX((int)ceil(filter_size/factor), 1);
|
||||||
|
|
||||||
|
if (filter_length > 1)
|
||||||
|
filter_length = FFALIGN(filter_length, 2);
|
||||||
|
|
||||||
if (exact_rational) {
|
if (exact_rational) {
|
||||||
int phase_count_exact, phase_count_exact_den;
|
int phase_count_exact, phase_count_exact_den;
|
||||||
|
@ -320,7 +300,7 @@ static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_r
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!c || c->phase_count != phase_count || c->linear!=linear || c->factor != factor
|
if (!c || c->phase_count != phase_count || c->linear!=linear || c->factor != factor
|
||||||
|| c->filter_length != FFMAX((int)ceil(filter_size/factor), 1) || c->format != format
|
|| c->filter_length != filter_length || c->format != format
|
||||||
|| c->filter_type != filter_type || c->kaiser_beta != kaiser_beta) {
|
|| c->filter_type != filter_type || c->kaiser_beta != kaiser_beta) {
|
||||||
c = av_mallocz(sizeof(*c));
|
c = av_mallocz(sizeof(*c));
|
||||||
if (!c)
|
if (!c)
|
||||||
|
@ -354,7 +334,7 @@ static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_r
|
||||||
c->phase_count = phase_count;
|
c->phase_count = phase_count;
|
||||||
c->linear = linear;
|
c->linear = linear;
|
||||||
c->factor = factor;
|
c->factor = factor;
|
||||||
c->filter_length = FFMAX((int)ceil(filter_size/factor), 1);
|
c->filter_length = filter_length;
|
||||||
c->filter_alloc = FFALIGN(c->filter_length, 8);
|
c->filter_alloc = FFALIGN(c->filter_length, 8);
|
||||||
c->filter_bank = av_calloc(c->filter_alloc, (phase_count+1)*c->felem_size);
|
c->filter_bank = av_calloc(c->filter_alloc, (phase_count+1)*c->felem_size);
|
||||||
c->filter_type = filter_type;
|
c->filter_type = filter_type;
|
||||||
|
|
|
@ -26,16 +26,16 @@ endef
|
||||||
#you can use this if you need to update it!
|
#you can use this if you need to update it!
|
||||||
#make -k `make fate-list | grep swr` | egrep 'TEST|stddev' | tr '\n' '@' | sed 's#TEST *\([^@]*\)@stddev: *\([0-9.]*\)[^b@]*bytes: *\([0-9]*\) */ *\([0-9]*\)@#fate-\1: CMP_TARGET = \2@fate-\1: SIZE_TOLERANCE = \3 - \4@@#g' | tr '@' '\n'
|
#make -k `make fate-list | grep swr` | egrep 'TEST|stddev' | tr '\n' '@' | sed 's#TEST *\([^@]*\)@stddev: *\([0-9.]*\)[^b@]*bytes: *\([0-9]*\) */ *\([0-9]*\)@#fate-\1: CMP_TARGET = \2@fate-\1: SIZE_TOLERANCE = \3 - \4@@#g' | tr '@' '\n'
|
||||||
|
|
||||||
fate-swr-resample-dblp-2626-44100: CMP_TARGET = 1352.69
|
fate-swr-resample-dblp-2626-44100: CMP_TARGET = 1352.67
|
||||||
fate-swr-resample-dblp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-dblp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-dblp-2626-48000: CMP_TARGET = 1352.66
|
fate-swr-resample-dblp-2626-48000: CMP_TARGET = 1352.66
|
||||||
fate-swr-resample-dblp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-dblp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-dblp-2626-8000: CMP_TARGET = 1353.09
|
fate-swr-resample-dblp-2626-8000: CMP_TARGET = 1352.56
|
||||||
fate-swr-resample-dblp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
fate-swr-resample-dblp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
||||||
|
|
||||||
fate-swr-resample-dblp-2626-96000: CMP_TARGET = 1352.68
|
fate-swr-resample-dblp-2626-96000: CMP_TARGET = 1352.67
|
||||||
fate-swr-resample-dblp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-dblp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-dblp-44100-2626: CMP_TARGET = 185.82
|
fate-swr-resample-dblp-44100-2626: CMP_TARGET = 185.82
|
||||||
|
@ -62,7 +62,7 @@ fate-swr-resample-dblp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
|
||||||
fate-swr-resample-dblp-48000-96000: CMP_TARGET = 0.47
|
fate-swr-resample-dblp-48000-96000: CMP_TARGET = 0.47
|
||||||
fate-swr-resample-dblp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
fate-swr-resample-dblp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
||||||
|
|
||||||
fate-swr-resample-dblp-8000-2626: CMP_TARGET = 2506.02
|
fate-swr-resample-dblp-8000-2626: CMP_TARGET = 2503.33
|
||||||
fate-swr-resample-dblp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
fate-swr-resample-dblp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
||||||
|
|
||||||
fate-swr-resample-dblp-8000-44100: CMP_TARGET = 15.09
|
fate-swr-resample-dblp-8000-44100: CMP_TARGET = 15.09
|
||||||
|
@ -74,7 +74,7 @@ fate-swr-resample-dblp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
fate-swr-resample-dblp-8000-96000: CMP_TARGET = 13.81
|
fate-swr-resample-dblp-8000-96000: CMP_TARGET = 13.81
|
||||||
fate-swr-resample-dblp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
fate-swr-resample-dblp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
|
|
||||||
fate-swr-resample-dblp-96000-2626: CMP_TARGET = 675.08
|
fate-swr-resample-dblp-96000-2626: CMP_TARGET = 675.07
|
||||||
fate-swr-resample-dblp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
fate-swr-resample-dblp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
||||||
|
|
||||||
fate-swr-resample-dblp-96000-44100: CMP_TARGET = 1.44
|
fate-swr-resample-dblp-96000-44100: CMP_TARGET = 1.44
|
||||||
|
@ -86,16 +86,16 @@ fate-swr-resample-dblp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
|
||||||
fate-swr-resample-dblp-96000-8000: CMP_TARGET = 58.57
|
fate-swr-resample-dblp-96000-8000: CMP_TARGET = 58.57
|
||||||
fate-swr-resample-dblp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
fate-swr-resample-dblp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
||||||
|
|
||||||
fate-swr-resample-fltp-2626-44100: CMP_TARGET = 1352.69
|
fate-swr-resample-fltp-2626-44100: CMP_TARGET = 1352.67
|
||||||
fate-swr-resample-fltp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-fltp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-fltp-2626-48000: CMP_TARGET = 1352.66
|
fate-swr-resample-fltp-2626-48000: CMP_TARGET = 1352.66
|
||||||
fate-swr-resample-fltp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-fltp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-fltp-2626-8000: CMP_TARGET = 1353.09
|
fate-swr-resample-fltp-2626-8000: CMP_TARGET = 1352.56
|
||||||
fate-swr-resample-fltp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
fate-swr-resample-fltp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
||||||
|
|
||||||
fate-swr-resample-fltp-2626-96000: CMP_TARGET = 1352.68
|
fate-swr-resample-fltp-2626-96000: CMP_TARGET = 1352.67
|
||||||
fate-swr-resample-fltp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-fltp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-fltp-44100-2626: CMP_TARGET = 185.82
|
fate-swr-resample-fltp-44100-2626: CMP_TARGET = 185.82
|
||||||
|
@ -122,7 +122,7 @@ fate-swr-resample-fltp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
|
||||||
fate-swr-resample-fltp-48000-96000: CMP_TARGET = 0.47
|
fate-swr-resample-fltp-48000-96000: CMP_TARGET = 0.47
|
||||||
fate-swr-resample-fltp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
fate-swr-resample-fltp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
||||||
|
|
||||||
fate-swr-resample-fltp-8000-2626: CMP_TARGET = 2506.02
|
fate-swr-resample-fltp-8000-2626: CMP_TARGET = 2503.33
|
||||||
fate-swr-resample-fltp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
fate-swr-resample-fltp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
||||||
|
|
||||||
fate-swr-resample-fltp-8000-44100: CMP_TARGET = 15.09
|
fate-swr-resample-fltp-8000-44100: CMP_TARGET = 15.09
|
||||||
|
@ -134,7 +134,7 @@ fate-swr-resample-fltp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
fate-swr-resample-fltp-8000-96000: CMP_TARGET = 13.81
|
fate-swr-resample-fltp-8000-96000: CMP_TARGET = 13.81
|
||||||
fate-swr-resample-fltp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
fate-swr-resample-fltp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
|
|
||||||
fate-swr-resample-fltp-96000-2626: CMP_TARGET = 675.08
|
fate-swr-resample-fltp-96000-2626: CMP_TARGET = 675.07
|
||||||
fate-swr-resample-fltp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
fate-swr-resample-fltp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
||||||
|
|
||||||
fate-swr-resample-fltp-96000-44100: CMP_TARGET = 1.44
|
fate-swr-resample-fltp-96000-44100: CMP_TARGET = 1.44
|
||||||
|
@ -146,16 +146,16 @@ fate-swr-resample-fltp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
|
||||||
fate-swr-resample-fltp-96000-8000: CMP_TARGET = 58.57
|
fate-swr-resample-fltp-96000-8000: CMP_TARGET = 58.57
|
||||||
fate-swr-resample-fltp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
fate-swr-resample-fltp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
||||||
|
|
||||||
fate-swr-resample-s16p-2626-44100: CMP_TARGET = 1393.02
|
fate-swr-resample-s16p-2626-44100: CMP_TARGET = 1392.98
|
||||||
fate-swr-resample-s16p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-s16p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-s16p-2626-48000: CMP_TARGET = 1393.01
|
fate-swr-resample-s16p-2626-48000: CMP_TARGET = 1393.01
|
||||||
fate-swr-resample-s16p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-s16p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-s16p-2626-8000: CMP_TARGET = 1393.91
|
fate-swr-resample-s16p-2626-8000: CMP_TARGET = 1393.36
|
||||||
fate-swr-resample-s16p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
fate-swr-resample-s16p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
||||||
|
|
||||||
fate-swr-resample-s16p-2626-96000: CMP_TARGET = 1393.09
|
fate-swr-resample-s16p-2626-96000: CMP_TARGET = 1393.07
|
||||||
fate-swr-resample-s16p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-s16p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-s16p-44100-2626: CMP_TARGET = 185.84
|
fate-swr-resample-s16p-44100-2626: CMP_TARGET = 185.84
|
||||||
|
@ -182,7 +182,7 @@ fate-swr-resample-s16p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
|
||||||
fate-swr-resample-s16p-48000-96000: CMP_TARGET = 0.73
|
fate-swr-resample-s16p-48000-96000: CMP_TARGET = 0.73
|
||||||
fate-swr-resample-s16p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
fate-swr-resample-s16p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
||||||
|
|
||||||
fate-swr-resample-s16p-8000-2626: CMP_TARGET = 2506.02
|
fate-swr-resample-s16p-8000-2626: CMP_TARGET = 2503.32
|
||||||
fate-swr-resample-s16p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
fate-swr-resample-s16p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
||||||
|
|
||||||
fate-swr-resample-s16p-8000-44100: CMP_TARGET = 15.13
|
fate-swr-resample-s16p-8000-44100: CMP_TARGET = 15.13
|
||||||
|
@ -206,16 +206,16 @@ fate-swr-resample-s16p-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
|
||||||
fate-swr-resample-s16p-96000-8000: CMP_TARGET = 58.60
|
fate-swr-resample-s16p-96000-8000: CMP_TARGET = 58.60
|
||||||
fate-swr-resample-s16p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
fate-swr-resample-s16p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
||||||
|
|
||||||
fate-swr-resample-s32p-2626-44100: CMP_TARGET = 1393.02
|
fate-swr-resample-s32p-2626-44100: CMP_TARGET = 1392.99
|
||||||
fate-swr-resample-s32p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-s32p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-s32p-2626-48000: CMP_TARGET = 1393.01
|
fate-swr-resample-s32p-2626-48000: CMP_TARGET = 1393.01
|
||||||
fate-swr-resample-s32p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-s32p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-s32p-2626-8000: CMP_TARGET = 1393.90
|
fate-swr-resample-s32p-2626-8000: CMP_TARGET = 1393.36
|
||||||
fate-swr-resample-s32p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
fate-swr-resample-s32p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
||||||
|
|
||||||
fate-swr-resample-s32p-2626-96000: CMP_TARGET = 1393.01
|
fate-swr-resample-s32p-2626-96000: CMP_TARGET = 1393.00
|
||||||
fate-swr-resample-s32p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample-s32p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample-s32p-44100-2626: CMP_TARGET = 185.82
|
fate-swr-resample-s32p-44100-2626: CMP_TARGET = 185.82
|
||||||
|
@ -242,7 +242,7 @@ fate-swr-resample-s32p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
|
||||||
fate-swr-resample-s32p-48000-96000: CMP_TARGET = 0.47
|
fate-swr-resample-s32p-48000-96000: CMP_TARGET = 0.47
|
||||||
fate-swr-resample-s32p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
fate-swr-resample-s32p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
||||||
|
|
||||||
fate-swr-resample-s32p-8000-2626: CMP_TARGET = 2506.02
|
fate-swr-resample-s32p-8000-2626: CMP_TARGET = 2503.33
|
||||||
fate-swr-resample-s32p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
fate-swr-resample-s32p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
||||||
|
|
||||||
fate-swr-resample-s32p-8000-44100: CMP_TARGET = 15.09
|
fate-swr-resample-s32p-8000-44100: CMP_TARGET = 15.09
|
||||||
|
@ -254,7 +254,7 @@ fate-swr-resample-s32p-8000-48000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
fate-swr-resample-s32p-8000-96000: CMP_TARGET = 13.81
|
fate-swr-resample-s32p-8000-96000: CMP_TARGET = 13.81
|
||||||
fate-swr-resample-s32p-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
fate-swr-resample-s32p-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
|
|
||||||
fate-swr-resample-s32p-96000-2626: CMP_TARGET = 675.08
|
fate-swr-resample-s32p-96000-2626: CMP_TARGET = 675.07
|
||||||
fate-swr-resample-s32p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
fate-swr-resample-s32p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
||||||
|
|
||||||
fate-swr-resample-s32p-96000-44100: CMP_TARGET = 1.44
|
fate-swr-resample-s32p-96000-44100: CMP_TARGET = 1.44
|
||||||
|
@ -389,16 +389,16 @@ fate-swr-resample_exact-$(3)-$(1)-$(2): FUZZ = 0.1
|
||||||
fate-swr-resample_exact-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
|
fate-swr-resample_exact-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
|
||||||
endef
|
endef
|
||||||
|
|
||||||
fate-swr-resample_exact-dblp-2626-44100: CMP_TARGET = 1352.69
|
fate-swr-resample_exact-dblp-2626-44100: CMP_TARGET = 1352.67
|
||||||
fate-swr-resample_exact-dblp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-dblp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-dblp-2626-48000: CMP_TARGET = 1352.66
|
fate-swr-resample_exact-dblp-2626-48000: CMP_TARGET = 1352.66
|
||||||
fate-swr-resample_exact-dblp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-dblp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-dblp-2626-8000: CMP_TARGET = 1353.09
|
fate-swr-resample_exact-dblp-2626-8000: CMP_TARGET = 1352.56
|
||||||
fate-swr-resample_exact-dblp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
fate-swr-resample_exact-dblp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
||||||
|
|
||||||
fate-swr-resample_exact-dblp-2626-96000: CMP_TARGET = 1352.68
|
fate-swr-resample_exact-dblp-2626-96000: CMP_TARGET = 1352.67
|
||||||
fate-swr-resample_exact-dblp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-dblp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-dblp-44100-2626: CMP_TARGET = 185.82
|
fate-swr-resample_exact-dblp-44100-2626: CMP_TARGET = 185.82
|
||||||
|
@ -425,7 +425,7 @@ fate-swr-resample_exact-dblp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
|
||||||
fate-swr-resample_exact-dblp-48000-96000: CMP_TARGET = 0.47
|
fate-swr-resample_exact-dblp-48000-96000: CMP_TARGET = 0.47
|
||||||
fate-swr-resample_exact-dblp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
fate-swr-resample_exact-dblp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-dblp-8000-2626: CMP_TARGET = 2506.02
|
fate-swr-resample_exact-dblp-8000-2626: CMP_TARGET = 2503.33
|
||||||
fate-swr-resample_exact-dblp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
fate-swr-resample_exact-dblp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
||||||
|
|
||||||
fate-swr-resample_exact-dblp-8000-44100: CMP_TARGET = 14.59
|
fate-swr-resample_exact-dblp-8000-44100: CMP_TARGET = 14.59
|
||||||
|
@ -437,7 +437,7 @@ fate-swr-resample_exact-dblp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
fate-swr-resample_exact-dblp-8000-96000: CMP_TARGET = 13.62
|
fate-swr-resample_exact-dblp-8000-96000: CMP_TARGET = 13.62
|
||||||
fate-swr-resample_exact-dblp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
fate-swr-resample_exact-dblp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-dblp-96000-2626: CMP_TARGET = 675.08
|
fate-swr-resample_exact-dblp-96000-2626: CMP_TARGET = 675.07
|
||||||
fate-swr-resample_exact-dblp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
fate-swr-resample_exact-dblp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
||||||
|
|
||||||
fate-swr-resample_exact-dblp-96000-44100: CMP_TARGET = 1.23
|
fate-swr-resample_exact-dblp-96000-44100: CMP_TARGET = 1.23
|
||||||
|
@ -449,16 +449,16 @@ fate-swr-resample_exact-dblp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
|
||||||
fate-swr-resample_exact-dblp-96000-8000: CMP_TARGET = 58.52
|
fate-swr-resample_exact-dblp-96000-8000: CMP_TARGET = 58.52
|
||||||
fate-swr-resample_exact-dblp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
fate-swr-resample_exact-dblp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
||||||
|
|
||||||
fate-swr-resample_exact-fltp-2626-44100: CMP_TARGET = 1352.69
|
fate-swr-resample_exact-fltp-2626-44100: CMP_TARGET = 1352.67
|
||||||
fate-swr-resample_exact-fltp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-fltp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-fltp-2626-48000: CMP_TARGET = 1352.66
|
fate-swr-resample_exact-fltp-2626-48000: CMP_TARGET = 1352.66
|
||||||
fate-swr-resample_exact-fltp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-fltp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-fltp-2626-8000: CMP_TARGET = 1353.09
|
fate-swr-resample_exact-fltp-2626-8000: CMP_TARGET = 1352.56
|
||||||
fate-swr-resample_exact-fltp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
fate-swr-resample_exact-fltp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
||||||
|
|
||||||
fate-swr-resample_exact-fltp-2626-96000: CMP_TARGET = 1352.68
|
fate-swr-resample_exact-fltp-2626-96000: CMP_TARGET = 1352.67
|
||||||
fate-swr-resample_exact-fltp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-fltp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-fltp-44100-2626: CMP_TARGET = 185.82
|
fate-swr-resample_exact-fltp-44100-2626: CMP_TARGET = 185.82
|
||||||
|
@ -485,7 +485,7 @@ fate-swr-resample_exact-fltp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
|
||||||
fate-swr-resample_exact-fltp-48000-96000: CMP_TARGET = 0.47
|
fate-swr-resample_exact-fltp-48000-96000: CMP_TARGET = 0.47
|
||||||
fate-swr-resample_exact-fltp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
fate-swr-resample_exact-fltp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-fltp-8000-2626: CMP_TARGET = 2506.02
|
fate-swr-resample_exact-fltp-8000-2626: CMP_TARGET = 2503.33
|
||||||
fate-swr-resample_exact-fltp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
fate-swr-resample_exact-fltp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
||||||
|
|
||||||
fate-swr-resample_exact-fltp-8000-44100: CMP_TARGET = 14.59
|
fate-swr-resample_exact-fltp-8000-44100: CMP_TARGET = 14.59
|
||||||
|
@ -497,7 +497,7 @@ fate-swr-resample_exact-fltp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
fate-swr-resample_exact-fltp-8000-96000: CMP_TARGET = 13.62
|
fate-swr-resample_exact-fltp-8000-96000: CMP_TARGET = 13.62
|
||||||
fate-swr-resample_exact-fltp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
fate-swr-resample_exact-fltp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-fltp-96000-2626: CMP_TARGET = 675.08
|
fate-swr-resample_exact-fltp-96000-2626: CMP_TARGET = 675.07
|
||||||
fate-swr-resample_exact-fltp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
fate-swr-resample_exact-fltp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
||||||
|
|
||||||
fate-swr-resample_exact-fltp-96000-44100: CMP_TARGET = 1.23
|
fate-swr-resample_exact-fltp-96000-44100: CMP_TARGET = 1.23
|
||||||
|
@ -509,16 +509,16 @@ fate-swr-resample_exact-fltp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
|
||||||
fate-swr-resample_exact-fltp-96000-8000: CMP_TARGET = 58.52
|
fate-swr-resample_exact-fltp-96000-8000: CMP_TARGET = 58.52
|
||||||
fate-swr-resample_exact-fltp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
fate-swr-resample_exact-fltp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
||||||
|
|
||||||
fate-swr-resample_exact-s16p-2626-44100: CMP_TARGET = 1393.02
|
fate-swr-resample_exact-s16p-2626-44100: CMP_TARGET = 1392.98
|
||||||
fate-swr-resample_exact-s16p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-s16p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-s16p-2626-48000: CMP_TARGET = 1393.01
|
fate-swr-resample_exact-s16p-2626-48000: CMP_TARGET = 1393.01
|
||||||
fate-swr-resample_exact-s16p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-s16p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-s16p-2626-8000: CMP_TARGET = 1393.91
|
fate-swr-resample_exact-s16p-2626-8000: CMP_TARGET = 1393.36
|
||||||
fate-swr-resample_exact-s16p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
fate-swr-resample_exact-s16p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
||||||
|
|
||||||
fate-swr-resample_exact-s16p-2626-96000: CMP_TARGET = 1393.09
|
fate-swr-resample_exact-s16p-2626-96000: CMP_TARGET = 1393.07
|
||||||
fate-swr-resample_exact-s16p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-s16p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-s16p-44100-2626: CMP_TARGET = 185.84
|
fate-swr-resample_exact-s16p-44100-2626: CMP_TARGET = 185.84
|
||||||
|
@ -545,7 +545,7 @@ fate-swr-resample_exact-s16p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
|
||||||
fate-swr-resample_exact-s16p-48000-96000: CMP_TARGET = 0.73
|
fate-swr-resample_exact-s16p-48000-96000: CMP_TARGET = 0.73
|
||||||
fate-swr-resample_exact-s16p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
fate-swr-resample_exact-s16p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-s16p-8000-2626: CMP_TARGET = 2506.02
|
fate-swr-resample_exact-s16p-8000-2626: CMP_TARGET = 2503.32
|
||||||
fate-swr-resample_exact-s16p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
fate-swr-resample_exact-s16p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
||||||
|
|
||||||
fate-swr-resample_exact-s16p-8000-44100: CMP_TARGET = 14.63
|
fate-swr-resample_exact-s16p-8000-44100: CMP_TARGET = 14.63
|
||||||
|
@ -569,16 +569,16 @@ fate-swr-resample_exact-s16p-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
|
||||||
fate-swr-resample_exact-s16p-96000-8000: CMP_TARGET = 58.56
|
fate-swr-resample_exact-s16p-96000-8000: CMP_TARGET = 58.56
|
||||||
fate-swr-resample_exact-s16p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
fate-swr-resample_exact-s16p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
|
||||||
|
|
||||||
fate-swr-resample_exact-s32p-2626-44100: CMP_TARGET = 1393.02
|
fate-swr-resample_exact-s32p-2626-44100: CMP_TARGET = 1392.99
|
||||||
fate-swr-resample_exact-s32p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-s32p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-s32p-2626-48000: CMP_TARGET = 1393.01
|
fate-swr-resample_exact-s32p-2626-48000: CMP_TARGET = 1393.01
|
||||||
fate-swr-resample_exact-s32p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-s32p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-s32p-2626-8000: CMP_TARGET = 1393.90
|
fate-swr-resample_exact-s32p-2626-8000: CMP_TARGET = 1393.36
|
||||||
fate-swr-resample_exact-s32p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
fate-swr-resample_exact-s32p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
|
||||||
|
|
||||||
fate-swr-resample_exact-s32p-2626-96000: CMP_TARGET = 1393.01
|
fate-swr-resample_exact-s32p-2626-96000: CMP_TARGET = 1393.00
|
||||||
fate-swr-resample_exact-s32p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
fate-swr-resample_exact-s32p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-s32p-44100-2626: CMP_TARGET = 185.82
|
fate-swr-resample_exact-s32p-44100-2626: CMP_TARGET = 185.82
|
||||||
|
@ -605,7 +605,7 @@ fate-swr-resample_exact-s32p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
|
||||||
fate-swr-resample_exact-s32p-48000-96000: CMP_TARGET = 0.47
|
fate-swr-resample_exact-s32p-48000-96000: CMP_TARGET = 0.47
|
||||||
fate-swr-resample_exact-s32p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
fate-swr-resample_exact-s32p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-s32p-8000-2626: CMP_TARGET = 2506.02
|
fate-swr-resample_exact-s32p-8000-2626: CMP_TARGET = 2503.33
|
||||||
fate-swr-resample_exact-s32p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
fate-swr-resample_exact-s32p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
|
||||||
|
|
||||||
fate-swr-resample_exact-s32p-8000-44100: CMP_TARGET = 14.59
|
fate-swr-resample_exact-s32p-8000-44100: CMP_TARGET = 14.59
|
||||||
|
@ -617,7 +617,7 @@ fate-swr-resample_exact-s32p-8000-48000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
fate-swr-resample_exact-s32p-8000-96000: CMP_TARGET = 13.62
|
fate-swr-resample_exact-s32p-8000-96000: CMP_TARGET = 13.62
|
||||||
fate-swr-resample_exact-s32p-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
fate-swr-resample_exact-s32p-8000-96000: SIZE_TOLERANCE = 96000 - 20480
|
||||||
|
|
||||||
fate-swr-resample_exact-s32p-96000-2626: CMP_TARGET = 675.08
|
fate-swr-resample_exact-s32p-96000-2626: CMP_TARGET = 675.07
|
||||||
fate-swr-resample_exact-s32p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
fate-swr-resample_exact-s32p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
|
||||||
|
|
||||||
fate-swr-resample_exact-s32p-96000-44100: CMP_TARGET = 1.23
|
fate-swr-resample_exact-s32p-96000-44100: CMP_TARGET = 1.23
|
||||||
|
|
Loading…
Reference in New Issue
Block a user