haraldwolff
/
soxr-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix soxr_delay returning a negative number after end-of-input has been indicated

master
Rob Sykes 2015-08-20 14:13:22 +01:00
parent 755012f515
commit fa5a481987
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rate.h
View File

@ -621,17 +621,19 @@ static void rate_flush(rate_t * p)
uint64_t samples_out = (uint64_t)((double)p->samples_in / p->factor + .5);
#endif
size_t remaining = (size_t)(samples_out - p->samples_out);
sample_t * buff = calloc(1024, sizeof(*buff));
if (samples_out > p->samples_out) {
if ((size_t)fifo_occupancy(fifo) < remaining) {
uint64_t samples_in = p->samples_in;
sample_t * buff = calloc(1024, sizeof(*buff));
while ((size_t)fifo_occupancy(fifo) < remaining) {
rate_input(p, buff, 1024);
rate_process(p);
}
fifo_trim_to(fifo, (int)remaining);
p->samples_in = 0;
p->samples_in = samples_in;
free(buff);
}
free(buff);
}
static void rate_close(rate_t * p)
@ -663,10 +665,10 @@ static double rate_delay(rate_t * p)
{
#if defined _MSC_VER && _MSC_VER == 1200
double samples_out = (double)(int64_t)p->samples_in / p->factor;
return samples_out - (double)(int64_t)p->samples_out;
return max(0, samples_out - (double)(int64_t)p->samples_out);
#else
double samples_out = (double)p->samples_in / p->factor;
return samples_out - (double)p->samples_out;
return max(0, samples_out - (double)p->samples_out);
#endif
}