Mercurial > libavcodec.hg
changeset 2403:6d53608cf2cf libavcodec
special case for filter_length==1
| author | michael |
|---|---|
| date | Fri, 31 Dec 2004 12:58:46 +0000 |
| parents | f9d4e1eddbc5 |
| children | 2e90350ff8bc |
| files | resample2.c |
| diffstat | 1 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/resample2.c Fri Dec 31 00:07:17 2004 +0000 +++ b/resample2.c Fri Dec 31 12:58:46 2004 +0000 @@ -141,7 +141,7 @@ c->phase_mask= phase_count-1; c->linear= linear; - c->filter_length= ceil(filter_size/factor); + c->filter_length= FFMAX(ceil(filter_size/factor), 1); c->filter_bank= av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM)); av_build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<<FILTER_SHIFT, 1); memcpy(&c->filter_bank[c->filter_length*phase_count+1], c->filter_bank, (c->filter_length-1)*sizeof(FELEM)); @@ -194,6 +194,22 @@ int dst_incr= c->dst_incr / c->src_incr; int compensation_distance= c->compensation_distance; + if(compensation_distance == 0 && c->filter_length == 1 && c->phase_shift==0){ + assert(index >= 0); + for(dst_index=0; dst_index < dst_size; dst_index++){ + if(index < src_size) + dst[dst_index] = src[index]; + else + break; + + frac += dst_incr_frac; + index += dst_incr; + if(frac >= c->src_incr){ + frac -= c->src_incr; + index++; + } + } + }else{ for(dst_index=0; dst_index < dst_size; dst_index++){ FELEM *filter= c->filter_bank + c->filter_length*(index & c->phase_mask); int sample_index= index >> c->phase_shift; @@ -234,6 +250,7 @@ dst_incr= c->ideal_dst_incr / c->src_incr; } } + } *consumed= FFMAX(index, 0) >> c->phase_shift; if(index>=0) index &= c->phase_mask;