#undef LOCAL_DEBUG
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
-#include "images/images.h"
-#include "images/duplicates.h"
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include <images/images.h>
+#include <images/duplicates.h>
#include <fcntl.h>
-static uns image_dup_ratio_threshold = 140;
-static uns image_dup_error_threshold = 100;
-
-static inline uns
+static inline uint
err (int a, int b)
{
a -= b;
}
static inline u64
-err_sum(byte *pos1, byte *pos2, uns count)
+err_sum(byte *pos1, byte *pos2, uint count)
{
- uns e64 = 0;
+ uint e64 = 0;
while (count--)
{
- uns e = err(*pos1++, *pos2++);
+ uint e = err(*pos1++, *pos2++);
e += err(*pos1++, *pos2++);
e += err(*pos1++, *pos2++);
e64 += e;
}
static inline u64
-err_sum_transformed(byte *pos1, byte *pos2, uns cols, uns rows, int row_step_1, int col_step_2, int row_step_2)
+err_sum_transformed(byte *pos1, byte *pos2, uint cols, uint rows, int row_step_1, int col_step_2, int row_step_2)
{
DBG("err_sum_transformed(pos1=%p pos2=%p cols=%u rows=%u row_step_1=%d col_step_2=%d row_step_2=%d)",
pos1, pos2, cols, rows, row_step_1, col_step_2, row_step_2);
u64 e64 = 0;
- for (uns j = rows; j--; )
+ for (uint j = rows; j--; )
{
byte *p1 = pos1;
byte *p2 = pos2;
- uns e = 0;
- for (uns i = cols; i--; )
+ uint e = 0;
+ for (uint i = cols; i--; )
{
e += err(p1[0], p2[0]);
e += err(p1[1], p2[1]);
}
static inline int
-aspect_ratio_test(uns cols1, uns rows1, uns cols2, uns rows2)
+aspect_ratio_test(struct image_dup_context *ctx, uint cols1, uint rows1, uint cols2, uint rows2)
{
DBG("aspect_ratio_test(cols1=%u rows1=%u cols2=%u rows2=%u)", cols1, rows1, cols2, rows2);
- uns r1 = cols1 * rows2;
- uns r2 = rows1 * cols2;
+ uint r1 = cols1 * rows2;
+ uint r2 = rows1 * cols2;
return
- r1 <= ((r2 * image_dup_ratio_threshold) >> 7) &&
- r2 <= ((r1 * image_dup_ratio_threshold) >> 7);
+ r1 <= ((r2 * ctx->ratio_threshold) >> 7) &&
+ r2 <= ((r1 * ctx->ratio_threshold) >> 7);
}
static inline int
-average_compare(struct image_dup *dup1, struct image_dup *dup2)
+average_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2)
{
byte *block1 = image_dup_block(dup1, 0, 0);
byte *block2 = image_dup_block(dup2, 0, 0);
- uns e =
+ uint e =
err(block1[0], block2[0]) +
err(block1[1], block2[1]) +
err(block1[2], block2[2]);
- return e <= image_dup_error_threshold;
+ return e <= ctx->error_threshold;
}
static int
-blocks_compare(struct image_dup *dup1, struct image_dup *dup2, uns tab_col, uns tab_row, uns trans)
+blocks_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2, uint tab_col, uint tab_row, uint trans)
{
DBG("blocks_compare(tab_col=%d tab_row=%d trans=%d)", tab_col, tab_row, trans);
+ ctx->sum_pixels += 1 << (tab_col + tab_row);
byte *block1 = image_dup_block(dup1, tab_col, tab_row);
byte *block2;
int col_step, row_step;
switch (trans)
{
case 0: ;
- uns err = (err_sum(block1, block2, 1 << (tab_col + tab_row)) >> (tab_col + tab_row));
+ uint err = (err_sum(block1, block2, 1 << (tab_col + tab_row)) >> (tab_col + tab_row));
DBG("average error=%d", err);
- return err <= image_dup_error_threshold;
+ ctx->error = err;
+ return err <= ctx->error_threshold;
case 1:
col_step = -3;
row_step = (3 << tab_col);
default:
ASSERT(0);
}
- uns err = (err_sum_transformed(block1, block2, (1 << tab_col), (1 << tab_row), (3 << tab_col), col_step, row_step) >> (tab_col + tab_row));
+ uint err = (err_sum_transformed(block1, block2, (1 << tab_col), (1 << tab_row), (3 << tab_col), col_step, row_step) >> (tab_col + tab_row));
DBG("average error=%d", err);
- return err <= image_dup_error_threshold;
+ ctx->error = err;
+ return err <= ctx->error_threshold;
}
static int
-same_size_compare(struct image_dup *dup1, struct image_dup *dup2, uns trans)
+same_size_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2, uint trans)
{
- struct image *img1 = dup1->image;
- struct image *img2 = dup2->image;
+ struct image *img1 = &dup1->image;
+ struct image *img2 = &dup2->image;
+ if (!img1->pixels || !img2->pixels)
+ return 1;
+ ctx->sum_pixels += img1->cols * img1->rows;
byte *block1 = img1->pixels;
byte *block2 = img2->pixels;
int col_step, row_step;
default:
ASSERT(0);
}
- uns err = (err_sum_transformed(block1, block2, img1->cols, img1->rows, img1->row_size, col_step, row_step) / ((u64)img1->cols * img1->rows));
+ uint err = (err_sum_transformed(block1, block2, img1->cols, img1->rows, img1->row_size, col_step, row_step) / ((u64)img1->cols * img1->rows));
DBG("average error=%d", err);
- return err <= image_dup_error_threshold;
+ ctx->error = err;
+ return err <= ctx->error_threshold;
}
-uns
-image_dup_compare(struct image_dup *dup1, struct image_dup *dup2, uns flags)
+uint
+image_dup_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2)
{
- DBG("image_dup_compare()");
- if (!average_compare(dup1, dup2))
+ DBG("image_dup_compare(%p, %p)", dup1, dup2);
+ if (!average_compare(ctx, dup1, dup2))
return 0;
- struct image *img1 = dup1->image;
- struct image *img2 = dup2->image;
+ struct image *img1 = &dup1->image;
+ struct image *img2 = &dup2->image;
+ uint flags = ctx->flags;
if (flags & IMAGE_DUP_SCALE)
{
DBG("Scale support");
- if (!aspect_ratio_test(img1->cols, img1->rows, img2->cols, img2->rows))
+ if (!aspect_ratio_test(ctx, img1->cols, img1->rows, img2->cols, img2->rows))
flags &= ~0x0f;
- if (!aspect_ratio_test(img1->cols, img1->rows, img2->rows, img2->cols))
+ if (!aspect_ratio_test(ctx, img1->cols, img1->rows, img2->rows, img2->cols))
flags &= ~0xf0;
}
else
}
if (!(flags & 0xff))
return 0;
- uns result = 0;
+ uint result = 0;
if (flags & 0x0f)
{
- uns cols = MIN(dup1->tab_cols, dup2->tab_cols);
- uns rows = MIN(dup1->tab_rows, dup2->tab_rows);
- for (uns t = 0; t < 4; t++)
+ uint cols = MIN(dup1->tab_cols, dup2->tab_cols);
+ uint rows = MIN(dup1->tab_rows, dup2->tab_rows);
+ for (uint t = 0; t < 4; t++)
if (flags & (1 << t))
{
DBG("Testing trans %d", t);
- for (uns i = MAX(cols, rows); i--; )
+ uint i = MAX(cols, rows), depth = 1;
+ while (i--)
{
- uns col = MAX(0, (int)(cols - i));
- uns row = MAX(0, (int)(rows - i));
- if (!blocks_compare(dup1, dup2, col, row, t))
+ depth++;
+ uint col = MAX(0, (int)(cols - i));
+ uint row = MAX(0, (int)(rows - i));
+ if (!blocks_compare(ctx, dup1, dup2, col, row, t))
break;
if (!i &&
(img1->cols != img2->cols || img1->rows != img2->rows ||
- same_size_compare(dup1, dup2, t)))
+ same_size_compare(ctx, dup1, dup2, t)))
{
result |= 1 << t;
if (!(flags & IMAGE_DUP_WANT_ALL))
break;
}
}
+ ctx->sum_depth += depth;
}
}
if (flags & 0xf0)
{
- uns cols = MIN(dup1->tab_cols, dup2->tab_rows);
- uns rows = MIN(dup1->tab_rows, dup2->tab_cols);
- for (uns t = 4; t < 8; t++)
+ uint cols = MIN(dup1->tab_cols, dup2->tab_rows);
+ uint rows = MIN(dup1->tab_rows, dup2->tab_cols);
+ for (uint t = 4; t < 8; t++)
if (flags & (1 << t))
{
DBG("Testing trans %d", t);
- for (uns i = MAX(cols, rows); i--; )
+ uint i = MAX(cols, rows), depth = 1;
+ while (i--)
{
- uns col = MAX(0, (int)(cols - i));
- uns row = MAX(0, (int)(rows - i));
- if (!blocks_compare(dup1, dup2, col, row, t))
+ depth++;
+ uint col = MAX(0, (int)(cols - i));
+ uint row = MAX(0, (int)(rows - i));
+ if (!blocks_compare(ctx, dup1, dup2, col, row, t))
break;
if (!i &&
(img1->cols != img2->rows || img1->rows != img2->cols ||
- same_size_compare(dup1, dup2, t)) )
+ same_size_compare(ctx, dup1, dup2, t)) )
{
result |= 1 << t;
if (!(flags & IMAGE_DUP_WANT_ALL))
break;
}
}
+ ctx->sum_depth += depth;
}
}
return result;
projects / libucw.git / blobdiff