# HG changeset patch # User michael # Date 1087490086 0 # Node ID 76cdbe8322396aef07f80d0efcc201ce41f8bb4c # Parent 3dc9bbe1b15296cc438947ce5693f5bcf92e1bde avoid useless normalization and 10l fix diff -r 3dc9bbe1b152 -r 76cdbe832239 resample2.c --- a/resample2.c Thu Jun 17 15:43:23 2004 +0000 +++ b/resample2.c Thu Jun 17 16:34:46 2004 +0000 @@ -93,7 +93,7 @@ break; case 2: w = 2.0*x / (factor*tap_count*M_PI); - y *= bessel(16*sqrt(FFMAX(1-w*w, 0))) / bessel(16); + y *= bessel(16*sqrt(FFMAX(1-w*w, 0))); break; } @@ -139,10 +139,9 @@ } void av_resample_compensate(AVResampleContext *c, int sample_delta, int compensation_distance){ - assert(!c->compensation_distance); //FIXME - +// sample_delta += (c->ideal_dst_incr - c->dst_incr)*(int64_t)c->compensation_distance / c->ideal_dst_incr; c->compensation_distance= compensation_distance; - c->dst_incr-= c->ideal_dst_incr * sample_delta / compensation_distance; + c->dst_incr = c->ideal_dst_incr - c->ideal_dst_incr * (int64_t)sample_delta / compensation_distance; } /** @@ -202,7 +201,7 @@ } if(update_ctx){ if(c->compensation_distance){ - c->compensation_distance -= index; + c->compensation_distance -= dst_index; if(!c->compensation_distance) c->dst_incr= c->ideal_dst_incr; } @@ -210,5 +209,13 @@ c->index=0; } *consumed= index >> PHASE_SHIFT; +#if 0 + if(update_ctx && !c->compensation_distance){ +#undef rand + av_resample_compensate(c, rand() % (8000*2) - 8000, 8000*2); +av_log(NULL, AV_LOG_DEBUG, "%d %d %d\n", c->dst_incr, c->ideal_dst_incr, c->compensation_distance); + } +#endif + return dst_index; }