c->compensation_distance= 0;
if(!av_reduce(&c->src_incr, &c->dst_incr, out_rate, in_rate * (int64_t)phase_count, INT32_MAX/2))
goto error;
- c->ideal_dst_incr= c->dst_incr;
+ c->ideal_dst_incr = c->dst_incr;
+ c->dst_incr_div = c->dst_incr / c->src_incr;
+ c->dst_incr_mod = c->dst_incr % c->src_incr;
c->index= -phase_count*((c->filter_length-1)/2);
c->frac= 0;
- swresample_dsp_init(c);
+ swri_resample_dsp_init(c);
return c;
error:
c->dst_incr = c->ideal_dst_incr - c->ideal_dst_incr * (int64_t)sample_delta / compensation_distance;
else
c->dst_incr = c->ideal_dst_incr;
+
+ c->dst_incr_div = c->dst_incr / c->src_incr;
+ c->dst_incr_mod = c->dst_incr % c->src_incr;
+
return 0;
}
uint8_t *dst, const uint8_t *src, int *consumed,
int src_size, int dst_size, int update_ctx)
{
- int fn_idx = c->format - AV_SAMPLE_FMT_S16P;
-
if (c->filter_length == 1 && c->phase_shift == 0) {
int index= c->index;
int frac= c->frac;
- int dst_incr_frac= c->dst_incr % c->src_incr;
- int dst_incr= c->dst_incr / c->src_incr;
int64_t index2= (1LL<<32)*c->frac/c->src_incr + (1LL<<32)*index;
int64_t incr= (1LL<<32) * c->dst_incr / c->src_incr;
int new_size = (src_size * (int64_t)c->src_incr - frac + c->dst_incr - 1) / c->dst_incr;
dst_size= FFMIN(dst_size, new_size);
- c->dsp.resample_one[fn_idx](dst, src, dst_size, index2, incr);
+ c->dsp.resample_one(dst, src, dst_size, index2, incr);
- index += dst_size * dst_incr;
- index += (frac + dst_size * (int64_t)dst_incr_frac) / c->src_incr;
+ index += dst_size * c->dst_incr_div;
+ index += (frac + dst_size * (int64_t)c->dst_incr_mod) / c->src_incr;
av_assert2(index >= 0);
*consumed= index;
if (update_ctx) {
- c->frac = (frac + dst_size * (int64_t)dst_incr_frac) % c->src_incr;
+ c->frac = (frac + dst_size * (int64_t)c->dst_incr_mod) % c->src_incr;
c->index = 0;
}
} else {
int delta_n = (delta_frac + c->dst_incr - 1) / c->dst_incr;
dst_size = FFMIN(dst_size, delta_n);
- if (!c->linear) {
- *consumed = c->dsp.resample_common[fn_idx](c, dst, src, dst_size, update_ctx);
+ if (dst_size > 0) {
+ *consumed = c->dsp.resample(c, dst, src, dst_size, update_ctx);
} else {
- *consumed = c->dsp.resample_linear[fn_idx](c, dst, src, dst_size, update_ctx);
+ *consumed = 0;
}
}
if (c->compensation_distance) {
c->compensation_distance -= ret;
- if (!c->compensation_distance)
- c->dst_incr = c->ideal_dst_incr / c->src_incr;
+ if (!c->compensation_distance) {
+ c->dst_incr = c->ideal_dst_incr;
+ c->dst_incr_div = c->dst_incr / c->src_incr;
+ c->dst_incr_mod = c->dst_incr % c->src_incr;
+ }
}
return ret;