diff options
Diffstat (limited to 'source/blender/blenkernel/intern/tracking_region_tracker.c')
-rw-r--r-- | source/blender/blenkernel/intern/tracking_region_tracker.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/tracking_region_tracker.c b/source/blender/blenkernel/intern/tracking_region_tracker.c index a66a521783b..1d6bb88c3f4 100644 --- a/source/blender/blenkernel/intern/tracking_region_tracker.c +++ b/source/blender/blenkernel/intern/tracking_region_tracker.c @@ -200,10 +200,12 @@ void tracking_configure_tracker(const MovieTrackingTrack *track, options->minimum_correlation = track->minimum_correlation; options->sigma = 0.9; - if ((track->algorithm_flag & TRACK_ALGORITHM_FLAG_USE_MASK) != 0) + if ((track->algorithm_flag & TRACK_ALGORITHM_FLAG_USE_MASK) != 0) { options->image1_mask = mask; - else + } + else { options->image1_mask = NULL; + } } /* Perform tracking from a reference_marker to destination_ibuf. @@ -250,14 +252,16 @@ static bool configure_and_run_tracker(ImBuf *destination_ibuf, /* configure the tracker */ tracking_configure_tracker(track, mask, &options); - /* convert the marker corners and center into pixel coordinates in the search/destination images. */ + /* Convert the marker corners and center into pixel coordinates in the + * search/destination images. */ tracking_get_marker_coords_for_tracking( frame_width, frame_height, reference_marker, src_pixel_x, src_pixel_y); tracking_get_marker_coords_for_tracking( frame_width, frame_height, marker, dst_pixel_x, dst_pixel_y); - if (patch_new == NULL || reference_search_area == NULL) + if (patch_new == NULL || reference_search_area == NULL) { return false; + } /* run the tracker! */ tracked = libmv_trackRegion(&options, @@ -289,10 +293,12 @@ static bool refine_marker_reference_frame_get(MovieTrackingTrack *track, while (reference >= first_marker && reference <= last_marker && (reference->flag & MARKER_DISABLED) != 0) { - if (backwards) + if (backwards) { reference++; - else + } + else { reference--; + } } if (reference < first_marker || reference > last_marker) { @@ -357,8 +363,9 @@ void BKE_tracking_refine_marker(MovieClip *clip, reference_ibuf, track, reference_marker, &search_area_width, &search_area_height); /* If needed, compute track's mask. */ - if ((track->algorithm_flag & TRACK_ALGORITHM_FLAG_USE_MASK) != 0) + if ((track->algorithm_flag & TRACK_ALGORITHM_FLAG_USE_MASK) != 0) { mask = BKE_tracking_track_get_mask(frame_width, frame_height, track, marker); + } /* Run the tracker from reference frame to current one. */ tracked = configure_and_run_tracker(destination_ibuf, @@ -381,8 +388,9 @@ void BKE_tracking_refine_marker(MovieClip *clip, /* Free memory used for refining */ MEM_freeN(search_area); - if (mask) + if (mask) { MEM_freeN(mask); + } IMB_freeImBuf(reference_ibuf); IMB_freeImBuf(destination_ibuf); } |