update api of write and generate video, fix dependencies

app.py

@@ -151,8 +151,6 @@ def track(args):
 
     input_shape = reader.input_shape
     output_shape = reader.output_shape
-    ratio_y = input_shape[0] / (output_shape[0] // args.downsampling_factor)
-    ratio_x = input_shape[1] / (output_shape[1] // args.downsampling_factor)
 
     detections = []
     logger.info('---Detecting...')
@@ -173,7 +171,12 @@ def track(args):
     # store unfiltered results
     datestr = datetime.datetime.now().strftime('%Y%m%d%H%M%S%f')
     output_filename = op.splitext(args.video_path)[0] + "_" + datestr + '_unfiltered.txt'
-    write_tracking_results_to_file(results, ratio_x=ratio_x, ratio_y=ratio_y, output_filename=output_filename)
+    coord_mapping = reader.get_inv_mapping(args.downsampling_factor)
+    write_tracking_results_to_file(
+        results,
+        coord_mapping,  # Scale the output back to original video size
+        output_filename=output_filename,
+    )
     logger.info('---Filtering...')
 
     # read from the file
@@ -181,7 +184,11 @@ def track(args):
     filtered_results = filter_tracks(results, config_track.kappa, config_track.tau)
     # store filtered results
     output_filename = op.splitext(args.video_path)[0] + "_" + datestr + '_filtered.txt'
-    write_tracking_results_to_file(filtered_results, ratio_x=ratio_x, ratio_y=ratio_y, output_filename=output_filename)
+    write_tracking_results_to_file(
+        filtered_results,
+        lambda x, y: (x, y),  # No scaling, already scaled!
+        output_filename=output_filename,
+    )
 
     return filtered_results
 
@@ -222,9 +229,8 @@ def run_model(video_path, model_type, seconds, skip, tau, kappa, gps_file):
 
     # Generate new video
     generate_video_with_annotations(reader, output_json, output_path,
-                                    config_track.skip_frames, config_track.max_length,
-                                    config_track.downscale_output, logger, gps_data=gps_data,
-                                    labels2icons=labels2icons)
+                                    config_track.skip_frames, config_track.downscale_output, 
+                                    logger, gps_data=gps_data, labels2icons=labels2icons)
     output_label = count_objects(output_json, id_categories)
 
 

requirements.txt

@@ -1,5 +1,5 @@
-plastic-origins==1.2.0
-yolov5==6.0.7
+plastic-origins==2.1.0
+yolov5
 gradio>3.0.20
 osmnx
 folium