static inline void scale_mv(AVSContext *h, int *d_x, int *d_y,
cavs_vector *src, int distp)
{
- int den = h->scale_den[FFMAX(src->ref, 0)];
-
+ int64_t den = h->scale_den[FFMAX(src->ref, 0)];
*d_x = (src->x * distp * den + 256 + FF_SIGNBIT(src->x)) >> 9;
*d_y = (src->y * distp * den + 256 + FF_SIGNBIT(src->y)) >> 9;
}
mv_pred_median(h, mvP, mvA, mvB, mvC);
if (mode < MV_PRED_PSKIP) {
- mvP->x += get_se_golomb(&h->gb);
- mvP->y += get_se_golomb(&h->gb);
+ int mx = get_se_golomb(&h->gb) + (unsigned)mvP->x;
+ int my = get_se_golomb(&h->gb) + (unsigned)mvP->y;
+
+ if (mx != (int16_t)mx || my != (int16_t)my) {
+ av_log(h->avctx, AV_LOG_ERROR, "MV %d %d out of supported range\n", mx, my);
+ } else {
+ mvP->x = mx;
+ mvP->y = my;
+ }
}
set_mvs(mvP, size);
}