diff options
Diffstat (limited to 'libswresample/resample_template.c')
| -rw-r--r-- | libswresample/resample_template.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/libswresample/resample_template.c b/libswresample/resample_template.c index d71efd63c0..1636f4e95d 100644 --- a/libswresample/resample_template.c +++ b/libswresample/resample_template.c @@ -92,9 +92,13 @@ static int RENAME(resample_common)(ResampleContext *c, int dst_index; int index= c->index; int frac= c->frac; - int sample_index = index >> c->phase_shift; + int sample_index = 0; + + while (index >= c->phase_count) { + sample_index++; + index -= c->phase_count; + } - index &= c->phase_mask; for (dst_index = 0; dst_index < n; dst_index++) { FELEM *filter = ((FELEM *) c->filter_bank) + c->filter_alloc * index; @@ -111,8 +115,11 @@ static int RENAME(resample_common)(ResampleContext *c, frac -= c->src_incr; index++; } - sample_index += index >> c->phase_shift; - index &= c->phase_mask; + + while (index >= c->phase_count) { + sample_index++; + index -= c->phase_count; + } } if(update_ctx){ @@ -132,12 +139,16 @@ static int RENAME(resample_linear)(ResampleContext *c, int dst_index; int index= c->index; int frac= c->frac; - int sample_index = index >> c->phase_shift; + int sample_index = 0; #if FILTER_SHIFT == 0 double inv_src_incr = 1.0 / c->src_incr; #endif - index &= c->phase_mask; + while (index >= c->phase_count) { + sample_index++; + index -= c->phase_count; + } + for (dst_index = 0; dst_index < n; dst_index++) { FELEM *filter = ((FELEM *) c->filter_bank) + c->filter_alloc * index; FELEM2 val=0, v2 = 0; @@ -164,8 +175,11 @@ static int RENAME(resample_linear)(ResampleContext *c, frac -= c->src_incr; index++; } - sample_index += index >> c->phase_shift; - index &= c->phase_mask; + + while (index >= c->phase_count) { + sample_index++; + index -= c->phase_count; + } } if(update_ctx){ |