hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-24 02:24:07 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix interpolated_sad not working with vectors pointing far outside the frame.

Browse source
This commit is contained in:
Ari Koivula 2014-02-07 13:11:21 +02:00
parent db0bcfff98
commit 526e3f9790
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/picture.c
View file

@ -760,15 +760,23 @@ unsigned interpolated_sad(const picture *pic, const picture *ref,
int width = pic->width; int width = pic->width;
int height = pic->height; int height = pic->height;
int left, right, top, bottom;
int result = 0;
// Change the movement vector to point right next to the frame. This doesn't
// affect the result but removes some special cases.
if (ref_x > width) ref_x = width;
if (ref_y > height) ref_y = height;
if (ref_x + block_width < 0) ref_x = -block_width;
if (ref_y + block_height < 0) ref_y = -block_height;
// These are the number of pixels by how far the movement vector points // These are the number of pixels by how far the movement vector points
// outside the frame. They are always >= 0. If all of them are 0, the // outside the frame. They are always >= 0. If all of them are 0, the
// movement vector doesn't point outside the frame. // movement vector doesn't point outside the frame.
int left = (ref_x < 0) ? -ref_x : 0; left = (ref_x < 0) ? -ref_x : 0;
int top = (ref_y < 0) ? -ref_y : 0; top = (ref_y < 0) ? -ref_y : 0;
int right = (ref_x + block_width > width) ? ref_x + block_width - width : 0; right = (ref_x + block_width > width) ? ref_x + block_width - width : 0;
int bottom = (ref_y + block_height > height) ? ref_y + block_height - height : 0; bottom = (ref_y + block_height > height) ? ref_y + block_height - height : 0;
unsigned result = 0;
// Center picture to the current block and reference to the point where // Center picture to the current block and reference to the point where
// movement vector is pointing to. That point might be outside the buffer, // movement vector is pointing to. That point might be outside the buffer,