From 3a81b2cdd28d7e96c8b11ce3b53cf255fbc77be5 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Sun, 13 Jun 2010 10:53:20 +1200 Subject: [PATCH] change in_x, iny to x, y, and remove unused lut types --- edges.c | 14 +++++++------- edges.h | 4 ++-- gstsparrow.h | 14 -------------- sparrow.c | 7 ------- 4 files changed, 9 insertions(+), 30 deletions(-) diff --git a/edges.c b/edges.c index f15c968..fb30ef5 100644 --- a/edges.c +++ b/edges.c @@ -94,8 +94,8 @@ corners_to_full_lut(GstSparrow *sparrow, sparrow_find_lines_t *fl){ sparrow_corner_t *mesh_square = mesh_row; int i = y * sparrow->out.width + V_LINE_OFFSET; for(mcx = 0; mcx < mesh_w - 1; mcx++){ - int iy = mesh_square->in_y + mmy * mesh_square->dyd; - int ix = mesh_square->in_x + mmy * mesh_square->dxd; + int iy = mesh_square->y + mmy * mesh_square->dyd; + int ix = mesh_square->x + mmy * mesh_square->dxd; for (mmx = 0; mmx < LINE_PERIOD; mmx++, i++){ int ixx = CLAMP(ix >> SPARROW_FIXED_POINT, 0, max_x); int iyy = CLAMP(iy >> SPARROW_FIXED_POINT, 0, max_y); @@ -138,8 +138,8 @@ debug_corners_image(GstSparrow *sparrow, sparrow_find_lines_t *fl){ guint32 colours[4] = {0xff0000ff, 0x00ff0000, 0x0000ff00, 0xcccccccc}; for (int i = 0; i < fl->n_vlines * fl->n_hlines; i++){ sparrow_corner_t *c = &mesh[i]; - int x = c->in_x; - int y = c->in_y; + int x = c->x; + int y = c->y; /* GST_DEBUG("i %d status %d x: %f, y: %f dxr %f dyr %f dxd %f dyd %f\n" "int x, y %d,%d (raw %d,%d) data %p\n", @@ -208,7 +208,7 @@ debug_clusters(GstSparrow *sparrow, sparrow_find_lines_t *fl){ #define CLUSTER_SIZE 8 -/*create the mesh */ +/*find map points with common intersection data, and collect them into clusters */ static void make_clusters(GstSparrow *sparrow, sparrow_find_lines_t *fl){ sparrow_cluster_t *clusters = fl->clusters; @@ -435,8 +435,8 @@ make_corners(GstSparrow *sparrow, sparrow_find_lines_t *fl){ GST_DEBUG("corner %d: %d voters, %d votes, sum %d,%d, mean %d,%d\n", i, cluster->n, votes, xsum, ysum, xmean, ymean); - mesh[i].in_x = xmean; - mesh[i].in_y = ymean; + mesh[i].x = xmean; + mesh[i].y = ymean; mesh[i].status = CORNER_EXACT; GST_DEBUG("found corner %d at (%3f, %3f)\n", i, FLOATXY(xmean), FLOATXY(ymean)); diff --git a/edges.h b/edges.h index c7709f8..9e1f67d 100644 --- a/edges.h +++ b/edges.h @@ -35,8 +35,8 @@ typedef enum edges_state { } edges_state_t; typedef struct sparrow_corner_s { - int in_x; - int in_y; + int x; + int y; /*dyr -> dy to next point right dxd ->dx to next point down */ int dxr; diff --git a/gstsparrow.h b/gstsparrow.h index d8c5726..c080dd6 100644 --- a/gstsparrow.h +++ b/gstsparrow.h @@ -145,19 +145,6 @@ typedef struct sparrow_map_path_s { }sparrow_map_path_t; -typedef struct sparrow_map_row_s { - int start; - int end; - int in_x; - int in_y; - sparrow_map_path_t *points; -}sparrow_map_row_t; - -typedef struct sparrow_map_s { - sparrow_map_row_t *rows; - void *point_mem; -}sparrow_map_t; - typedef struct sparrow_map_lut_s{ guint16 x; guint16 y; @@ -225,7 +212,6 @@ struct _GstSparrow /*calibration results */ guint32 lag; guint8 *screenmask; - sparrow_map_t map; /*full sized LUT */ sparrow_map_lut_t *map_lut; /*for jpeg decompression*/ diff --git a/sparrow.c b/sparrow.c index 2811b7b..9df3cad 100644 --- a/sparrow.c +++ b/sparrow.c @@ -182,15 +182,8 @@ sparrow_init(GstSparrow *sparrow, GstCaps *incaps, GstCaps *outcaps){ sparrow->dsfmt = zalloc_aligned_or_die(sizeof(dsfmt_t)); sparrow->screenmask = malloc_aligned_or_die(in->pixcount); -#if ! USE_FULL_LUT - size_t point_memsize = (sizeof(sparrow_map_path_t) * sparrow->out.pixcount / LINE_PERIOD) + 1; - size_t row_memsize = sizeof(sparrow_map_row_t) * sparrow->out.height + 1; - sparrow->map.point_mem = malloc_aligned_or_die(point_memsize); - sparrow->map.rows = zalloc_aligned_or_die(row_memsize); -#else size_t lutsize = sizeof(sparrow_map_lut_t) * sparrow->out.pixcount; sparrow->map_lut = zalloc_aligned_or_die(lutsize); -#endif sparrow->timer_start.tv_sec = 0; sparrow->timer_stop.tv_sec = 0; -- 2.11.4.GIT