From: Milan C. <mil...@us...> - 2005-08-31 05:04:09
|
Update of /cvsroot/ffdshow/ffdshow/src/audioFilters/resample In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15035/src/audioFilters/resample Modified Files: resample2.cpp Log Message: no message Index: resample2.cpp =================================================================== RCS file: /cvsroot/ffdshow/ffdshow/src/audioFilters/resample/resample2.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** resample2.cpp 28 Aug 2005 17:40:19 -0000 1.18 --- resample2.cpp 31 Aug 2005 05:03:59 -0000 1.19 *************** *** 78,82 **** filter_bank0=NULL; } ! virtual int av_resample(sample_t *dst, sample_t *src, int *consumed, size_t src_size, size_t dst_size, int update_ctx)=0; ~AVResampleContextBase() { --- 78,82 ---- filter_bank0=NULL; } ! virtual int av_resample(sample_t *dst, sample_t *src, int *consumed, int src_size, int dst_size, int update_ctx)=0; ~AVResampleContextBase() { *************** *** 220,224 **** c->index= -phase_count*((c->filter_length-1)/2); } ! int av_resample(sample_t *dst, sample_t *src, int *consumed, size_t src_size, size_t dst_size, int update_ctx) { TAVResampleContext *c=this; --- 220,224 ---- c->index= -phase_count*((c->filter_length-1)/2); } ! int av_resample(sample_t *dst, sample_t *src, int *consumed, int src_size, int dst_size, int update_ctx) { TAVResampleContext *c=this; *************** *** 233,237 **** int64_t index2= ((int64_t)index)<<32; int64_t incr= (1LL<<32) * c->dst_incr / c->src_incr; ! dst_size= (int)FFMIN(dst_size, size_t((src_size-1-index) * (int64_t)c->src_incr / c->dst_incr)); for(dst_index=0; dst_index < dst_size; dst_index++){ --- 233,237 ---- int64_t index2= ((int64_t)index)<<32; int64_t incr= (1LL<<32) * c->dst_incr / c->src_incr; ! dst_size= FFMIN(dst_size, int((src_size-1-index) * (int64_t)c->src_incr / c->dst_incr)); for(dst_index=0; dst_index < dst_size; dst_index++){ *************** *** 363,367 **** nb_samples1 = 0; /* avoid warning */ int consumed; ! nb_samples1 = resample_context->av_resample( buftmp3, bufin, &consumed, nb_samples, lenout, 1); this->temp_len= nb_samples - consumed; this->temp= (sample_t*)realloc(this->temp, this->temp_len*sizeof(sample_t)); --- 363,367 ---- nb_samples1 = 0; /* avoid warning */ int consumed; ! nb_samples1 = resample_context->av_resample( buftmp3, bufin, &consumed, (int)nb_samples, (int)lenout, 1); this->temp_len= nb_samples - consumed; this->temp= (sample_t*)realloc(this->temp, this->temp_len*sizeof(sample_t)); |