depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fpi-assembling: Fix offsets to be relative to the previous frame

Browse source 
The offset stored for a frame was not always relative to the previous
frame. This was the case for reverse movement, but for forwrad movement
the offset was the one to the next frame.

Make the offset handling consistent and alwasy store the offset to the
previous frame. Also update the frame assembling code to add the offset
before blitting the frame (i.e. making it relative to the previous frame
there too).

Note that fpi_assemble_lines already made the assumption that this was
the case as it forced the offset for the first frame to be zero. As
such, the code was inconsistent.

This could affect the AES drivers slightly as they use hardware reported
values which might not adhere to these assumptions.
This commit is contained in:
Benjamin Berg 2019-12-06 18:55:52 +01:00
parent d9bcf9b9cc
commit 0d604fa34e
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libfprint/fpi-assembling.c
View file

@ -99,6 +99,8 @@ static void
find_overlap (struct fpi_frame_asmbl_ctx *ctx, find_overlap (struct fpi_frame_asmbl_ctx *ctx,
struct fpi_frame *first_frame, struct fpi_frame *first_frame,
struct fpi_frame *second_frame, struct fpi_frame *second_frame,
int *dx_out,
int *dy_out,
unsigned int *min_error) unsigned int *min_error)
{ {
int dx, dy; int dx, dy;
@ -120,8 +122,8 @@ find_overlap (struct fpi_frame_asmbl_ctx *ctx,
if (err < *min_error) if (err < *min_error)
{ {
*min_error = err; *min_error = err;
second_frame->delta_x = -dx; *dx_out = -dx;
second_frame->delta_y = dy; *dy_out = dy;
} }
} }
} }
@ -133,7 +135,7 @@ do_movement_estimation (struct fpi_frame_asmbl_ctx *ctx,
{ {
GSList *l; GSList *l;
GTimer *timer; GTimer *timer;
guint num_frames = 0; guint num_frames = 1;
struct fpi_frame *prev_stripe; struct fpi_frame *prev_stripe;
unsigned int min_error; unsigned int min_error;
/* Max error is width * height * 255, for AES2501 which has the largest /* Max error is width * height * 255, for AES2501 which has the largest
@ -143,20 +145,27 @@ do_movement_estimation (struct fpi_frame_asmbl_ctx *ctx,
unsigned long long total_error = 0; unsigned long long total_error = 0;
timer = g_timer_new (); timer = g_timer_new ();
/* Skip the first frame */
prev_stripe = stripes->data; prev_stripe = stripes->data;
for (l = stripes; l != NULL; l = l->next, num_frames++)
for (l = stripes->next; l != NULL; l = l->next, num_frames++)
{ {
struct fpi_frame *cur_stripe = l->data; struct fpi_frame *cur_stripe = l->data;
if (reverse) if (reverse)
{ {
find_overlap (ctx, prev_stripe, cur_stripe, &min_error); find_overlap (ctx, prev_stripe, cur_stripe,
&cur_stripe->delta_x, &cur_stripe->delta_y,
&min_error);
cur_stripe->delta_y = -cur_stripe->delta_y; cur_stripe->delta_y = -cur_stripe->delta_y;
cur_stripe->delta_x = -cur_stripe->delta_x; cur_stripe->delta_x = -cur_stripe->delta_x;
} }
else else
{ {
find_overlap (ctx, cur_stripe, prev_stripe, &min_error); find_overlap (ctx, cur_stripe, prev_stripe,
&cur_stripe->delta_x, &cur_stripe->delta_y,
&min_error);
} }
total_error += min_error; total_error += min_error;
@ -328,19 +337,10 @@ fpi_assemble_frames (struct fpi_frame_asmbl_ctx *ctx,
{ {
fpi_frame = l->data; fpi_frame = l->data;
if(reverse)
{
y += fpi_frame->delta_y; y += fpi_frame->delta_y;
x += fpi_frame->delta_x; x += fpi_frame->delta_x;
}
aes_blit_stripe (ctx, img, fpi_frame, x, y); aes_blit_stripe (ctx, img, fpi_frame, x, y);
if(!reverse)
{
y += fpi_frame->delta_y;
x += fpi_frame->delta_x;
}
} }
return img; return img;