swresample/resample_template: flip order of operations in swri_resample_linear() for 32bit

Fixes integer overflow

Found-by: BBB
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/76/merge
Michael Niedermayer 11 years ago
parent 7f5d75f95b
commit c5a405c4f0
  1. 5
      libswresample/resample_template.c

@ -62,7 +62,6 @@
# define DELEM int32_t # define DELEM int32_t
# define FELEM int32_t # define FELEM int32_t
# define FELEM2 int64_t # define FELEM2 int64_t
# define FELEML int64_t
# define FELEM_MAX INT32_MAX # define FELEM_MAX INT32_MAX
# define FELEM_MIN INT32_MIN # define FELEM_MIN INT32_MIN
# define OUT(d, v) v = (v + (1<<(FILTER_SHIFT-1)))>>FILTER_SHIFT;\ # define OUT(d, v) v = (v + (1<<(FILTER_SHIFT-1)))>>FILTER_SHIFT;\
@ -174,7 +173,11 @@ int RENAME(swri_resample_linear)(ResampleContext *c,
v2 += src[sample_index + i] * (FELEM2)filter[i + c->filter_alloc]; v2 += src[sample_index + i] * (FELEM2)filter[i + c->filter_alloc];
} }
#endif #endif
#ifdef FELEML
val += (v2 - val) * (FELEML) frac / c->src_incr; val += (v2 - val) * (FELEML) frac / c->src_incr;
#else
val += (v2 - val) / c->src_incr * frac;
#endif
OUT(dst[dst_index], val); OUT(dst[dst_index], val);
frac += c->dst_incr_mod; frac += c->dst_incr_mod;

Loading…
Cancel
Save