diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-07 18:54:03 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-07 18:54:03 +0400 |
| commit | d568f56f181d21869e86511d9cc5502d1f312a79 (patch) | |
| tree | 6f202bffdd4d9c9f9f04d2a26497421440680b8a /source/blender/blenkernel/intern/tracking.c | |
| parent | 11bacd403f16818023229bcebd22d609054eda16 (diff) | |
Merging remained part of hybrid tracker which adds correlation threshold
Keir's comment:
Add support for detecting tracking failure in the ESM tracker component of
libmv. Since both KLT and Hybrid rely on ESM underneath, KLT and Hybrid now
have a minimum correlation setting to match. With this fix, track failures
should get detected quicker, with the issue that sometimes the tracker will
give up too easily. That is fixable by reducing the required correlation (in
the track properties).
Command used for merge: svn merge -r 42396:42397 -r 42399:42400 ^/branches/soc-2011-tomato
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 9044661f369..cacea980fe2 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -77,7 +77,6 @@ void BKE_tracking_init_settings(MovieTracking *tracking) tracking->camera.units= CAMERA_UNITS_MM; tracking->settings.default_tracker= TRACKER_HYBRID; - tracking->settings.default_pyramid_levels= 2; tracking->settings.default_minimum_correlation= 0.75; tracking->settings.default_pattern_size= 11; tracking->settings.default_search_size= 51; @@ -810,9 +809,9 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u int level= MIN2(track->pyramid_levels, max_pyramid_levels); if(track->tracker==TRACKER_KLT) - track_context.region_tracker= libmv_pyramidRegionTrackerNew(100, level, MAX2(wndx, wndy)); + track_context.region_tracker= libmv_pyramidRegionTrackerNew(100, level, MAX2(wndx, wndy), track->minimum_correlation); else - track_context.region_tracker= libmv_hybridRegionTrackerNew(100, MAX2(wndx, wndy)); + track_context.region_tracker= libmv_hybridRegionTrackerNew(100, MAX2(wndx, wndy), track->minimum_correlation); } else if(track->tracker==TRACKER_SAD) { track_context.pattern_size= MAX2(patx, paty); |