From 18f5322f7c2145b772ab4d47a9d4cf890222b080 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 17 Aug 2011 17:12:10 +0000 Subject: Camera tracking integration =========================== - Bundling new libmv, issues with undefined uint and C99 functions should gone. - Changes to Detect operator to match new API. --- source/blender/blenkernel/BKE_tracking.h | 2 +- source/blender/blenkernel/intern/tracking.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h index 3681cb5f0e4..efb55c1c803 100644 --- a/source/blender/blenkernel/BKE_tracking.h +++ b/source/blender/blenkernel/BKE_tracking.h @@ -84,7 +84,7 @@ void BKE_tracking_projection_matrix(struct MovieTracking *tracking, int framenr, void BKE_tracking_apply_intrinsics(struct MovieTracking *tracking, float co[2], float nco[2]); void BKE_tracking_invert_intrinsics(struct MovieTracking *tracking, float co[2], float nco[2]); -void BKE_tracking_detect(struct MovieTracking *tracking, struct ImBuf *imbuf, int framenr, int margin, int min_trackness, int min_distance); +void BKE_tracking_detect(struct MovieTracking *tracking, struct ImBuf *imbuf, int framenr, int margin, int count, int min_distance); struct MovieTrackingTrack *BKE_tracking_indexed_bundle(struct MovieTracking *tracking, int bundlenr); diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index a1db0eb8dd0..b111909a3bd 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1363,22 +1363,22 @@ static unsigned char *acquire_ucharbuf(ImBuf *ibuf) } #endif -void BKE_tracking_detect(MovieTracking *tracking, ImBuf *ibuf, int framenr, int margin, int min_trackness, int min_distance) +void BKE_tracking_detect(MovieTracking *tracking, ImBuf *ibuf, int framenr, int margin, int count, int min_distance) { #ifdef WITH_LIBMV - struct libmv_Corners *corners; + struct libmv_Features *features; unsigned char *pixels= acquire_ucharbuf(ibuf); int a; - corners= libmv_detectCorners(pixels, ibuf->x, ibuf->y, ibuf->x, margin, min_trackness, min_distance); + features= libmv_detectFeatures(pixels, ibuf->x, ibuf->y, ibuf->x, margin, count, min_distance); MEM_freeN(pixels); - a= libmv_countCorners(corners); + a= libmv_countFeatures(features); while(a--) { MovieTrackingTrack *track; double x, y, size, score; - libmv_getCorner(corners, a, &x, &y, &score, &size); + libmv_getFeature(features, a, &x, &y, &score, &size); track= BKE_tracking_add_track(tracking, x/ibuf->x, 1.0f-(y/ibuf->y), framenr, ibuf->x, ibuf->y); track->flag|= SELECT; @@ -1386,7 +1386,7 @@ void BKE_tracking_detect(MovieTracking *tracking, ImBuf *ibuf, int framenr, int track->search_flag|= SELECT; } - libmv_destroyCorners(corners); + libmv_destroyFeatures(features); #endif } -- cgit v1.2.3