Tracker Effect minor fixes

include/CVTracker.h

@@ -64,6 +64,9 @@ class CVTracker {
     /// Will handle a Thread safely comutication between ClipProcessingJobs and the processing effect classes
     ProcessingController *processingController;
 
+    size_t start;
+    size_t end;
+
     // Initialize the tracker
     bool initTracker(cv::Mat &frame, size_t frameId);
 
@@ -80,7 +83,7 @@ class CVTracker {
 
     // Track object in the hole clip or in a given interval
     // If start, end and process_interval are passed as argument, clip will be processed in [start,end) 
-    void trackClip(openshot::Clip& video, size_t start=0, size_t end=0, bool process_interval=false);
+    void trackClip(openshot::Clip& video, size_t _start=0, size_t _end=0, bool process_interval=false);
 
     // Get tracked data for a given frame
     FrameData GetTrackedData(size_t frameId);

include/effects/Tracker.h

@@ -50,7 +50,7 @@ using google::protobuf::util::TimeUtil;
 
 // Tracking info struct
 struct EffectFrameData{
-  int frame_id = -1;
+  size_t frame_id = -1;
   float rotation = 0;
   int x1 = -1;
   int y1 = -1;

src/CVTracker.cpp

@@ -61,18 +61,23 @@ cv::Ptr<cv::Tracker> CVTracker::selectTracker(std::string trackerType){
 }
 
 // Track object in the hole clip or in a given interval
-void CVTracker::trackClip(openshot::Clip& video, size_t start, size_t end, bool process_interval){
+void CVTracker::trackClip(openshot::Clip& video, size_t _start, size_t _end, bool process_interval){
 
+    start = _start; end = _end;
+
+    video.Open();
+
     bool trackerInit = false;
 
     size_t frame;
     if(!process_interval || end == 0 || end-start <= 0){
         // Get total number of frames in video
-        end = video.Reader()->info.video_length;
+        start = video.Start() * video.Reader()->info.fps.ToInt();
+        end = video.End() * video.Reader()->info.fps.ToInt();
     }
 
     // Loop through video
-    for (frame = start; frame <= end; frame++)
+    for (frame = start; frame < end; frame++)
     {
 
         // Stop the feature tracker process
@@ -264,8 +269,7 @@ void CVTracker::SetJson(const std::string value) {
 	catch (const std::exception& e)
 	{
 		// Error parsing JSON (or missing keys)
-		// throw InvalidJSON("JSON is invalid (missing keys or invalid data types)");
-        std::cout<<"JSON is invalid (missing keys or invalid data types)"<<std::endl;
+		throw openshot::InvalidJSON("JSON is invalid (missing keys or invalid data types)");
 	}
 }
 

src/effects/Tracker.cpp

@@ -109,11 +109,11 @@ bool Tracker::LoadTrackedData(std::string inputFilePath){
     trackedDataById.clear();
 
     // Iterate over all frames of the saved message
-    for (int i = 0; i < trackerMessage.frame_size(); i++) {
+    for (size_t i = 0; i < trackerMessage.frame_size(); i++) {
         const libopenshottracker::Frame& pbFrameData = trackerMessage.frame(i);
 
         // Load frame and rotation data
-        int id = pbFrameData.id();
+        size_t id = pbFrameData.id();
         float rotation = pbFrameData.rotation();
 
         // Load bounding box data