Libmv: Replace region tracker with autotracker in Blender

The title actually tells it all, this commit switches Blender to use the new
autotrack API from Libmv.

From the user point of view it means that prediction model is now used when
tracking which gives really nice results.

All the other changes are not really visible for users, those are just frame
accessors, caches and so for the new API.

2 files changed, 15 insertions, 15 deletions

diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index a797a60f74c..497c3dd2c96 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -1159,7 +1159,7 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
 	/* if tracking is in progress, we should synchronize framenr from clipuser
 	 * so latest tracked frame would be shown */
 	if (clip && clip->tracking_context)
-		BKE_tracking_context_sync_user(clip->tracking_context, &sc->user);
+		BKE_autotrack_context_sync_user(clip->tracking_context, &sc->user);
 
 	if (sc->flag & SC_LOCK_SELECTION) {
 		ImBuf *tmpibuf = NULL;
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index fb6b1a0033c..bdb57cca81e 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -1083,7 +1083,7 @@ void CLIP_OT_slide_marker(wmOperatorType *ot)
 /********************** track operator *********************/
 
 typedef struct TrackMarkersJob {
-	struct MovieTrackingContext *context;   /* tracking context */
+	struct AutoTrackContext *context;   /* tracking context */
 	int sfra, efra, lastfra;    /* Start, end and recently tracked frames */
 	int backwards;              /* Backwards tracking flag */
 	MovieClip *clip;            /* Clip which is tracking */
@@ -1231,7 +1231,7 @@ static int track_markers_initjob(bContext *C, TrackMarkersJob *tmj, int backward
 			tmj->delay /= 2;
 	}
 
-	tmj->context = BKE_tracking_context_new(clip, &sc->user, backwards, 1);
+	tmj->context = BKE_autotrack_context_new(clip, &sc->user, backwards, 1);
 
 	clip->tracking_context = tmj->context;
 
@@ -1265,14 +1265,14 @@ static void track_markers_startjob(void *tmv, short *stop, short *do_update, flo
 
 			double start_time = PIL_check_seconds_timer(), exec_time;
 
-			if (!BKE_tracking_context_step(tmj->context))
+			if (!BKE_autotrack_context_step(tmj->context))
 				break;
 
 			exec_time = PIL_check_seconds_timer() - start_time;
 			if (tmj->delay > (float)exec_time)
 				PIL_sleep_ms(tmj->delay - (float)exec_time);
 		}
-		else if (!BKE_tracking_context_step(tmj->context))
+		else if (!BKE_autotrack_context_step(tmj->context))
 			break;
 
 		*do_update = true;
@@ -1296,7 +1296,7 @@ static void track_markers_updatejob(void *tmv)
 {
 	TrackMarkersJob *tmj = (TrackMarkersJob *)tmv;
 
-	BKE_tracking_context_sync(tmj->context);
+	BKE_autotrack_context_sync(tmj->context);
 }
 
 static void track_markers_endjob(void *tmv)
@@ -1310,8 +1310,8 @@ static void track_markers_endjob(void *tmv)
 		ED_update_for_newframe(tmj->main, tmj->scene, 0);
 	}
 
-	BKE_tracking_context_sync(tmj->context);
-	BKE_tracking_context_finish(tmj->context);
+	BKE_autotrack_context_sync(tmj->context);
+	BKE_autotrack_context_finish(tmj->context);
 
 	WM_main_add_notifier(NC_SCENE | ND_FRAME, tmj->scene);
 }
@@ -1319,7 +1319,7 @@ static void track_markers_endjob(void *tmv)
 static void track_markers_freejob(void *tmv)
 {
 	TrackMarkersJob *tmj = (TrackMarkersJob *)tmv;
-	BKE_tracking_context_free(tmj->context);
+	BKE_autotrack_context_free(tmj->context);
 	MEM_freeN(tmj);
 }
 
@@ -1328,7 +1328,7 @@ static int track_markers_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc;
 	MovieClip *clip;
 	Scene *scene = CTX_data_scene(C);
-	struct MovieTrackingContext *context;
+	struct AutoTrackContext *context;
 	MovieClipUser *user, fake_user = {0};
 	int framenr, sfra, efra;
 	const bool backwards = RNA_boolean_get(op->ptr, "backwards");
@@ -1388,10 +1388,10 @@ static int track_markers_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 
 	/* do not disable tracks due to threshold when tracking frame-by-frame */
-	context = BKE_tracking_context_new(clip, user, backwards, sequence);
+	context = BKE_autotrack_context_new(clip, user, backwards, sequence);
 
 	while (framenr != efra) {
-		if (!BKE_tracking_context_step(context))
+		if (!BKE_autotrack_context_step(context))
 			break;
 
 		if (backwards) framenr--;
@@ -1401,9 +1401,9 @@ static int track_markers_exec(bContext *C, wmOperator *op)
 			break;
 	}
 
-	BKE_tracking_context_sync(context);
-	BKE_tracking_context_finish(context);
-	BKE_tracking_context_free(context);
+	BKE_autotrack_context_sync(context);
+	BKE_autotrack_context_finish(context);
+	BKE_autotrack_context_free(context);
 
 	/* update scene current frame to the lastes tracked frame */
 	scene->r.cfra = BKE_movieclip_remap_clip_to_scene_frame(clip, framenr);