Video codec testing

app.py

@@ -110,6 +110,7 @@ def handle_next(_, progress=gr.Progress()):
     
     # Store result for that file
     result['json_result'].append(json_result)
+    result['aris_input'].append(file_path)
     result["path_video"].append(video_filepath)
     result["path_zip"].append(zip_filepath)
     result["path_json"].append(json_filepath)
@@ -148,15 +149,17 @@ def show_data():
     not_done = state['index'] < state['total']
 
 
+    annotation_html = ""
+    if result["aris_input"][i]:
+        frame_info = load_frames(result["aris_input"][i], result['json_result'][i])
 
-    frame_info = load_frames("static/example/input_file.aris", result['json_result'])
+        annotation_html = "<div style='display:flex'>"
+        annotation_html += "<canvas id='canvas' style='width:50%' onmousedown='mouse_down(event)' onmousemove='mouse_move(event)' onmouseup='mouse_up()' onmouseleave='mouse_up()'></canvas>"
+        annotation_html += "<div id='annotation_display' style='width:50%'></div>"
+        annotation_html += "</div>"
+        annotation_html += "<p id='annotation_info' style='display:none'>" + json.dumps(frame_info) + "</p>"
+        annotation_html += "<img id='annotation_img' onload='draw()' style='display:none'></img>"
 
-    annotation_html = "<div style='display:flex'>"
-    annotation_html += "<canvas id='canvas' style='width:50%' onmousedown='mouse_down(event)' onmousemove='mouse_move(event)' onmouseup='mouse_up()' onmouseleave='mouse_up()'></canvas>"
-    annotation_html += "<div id='annotation_display' style='width:50%'></div>"
-    annotation_html += "</div>"
-    annotation_html += "<p id='annotation_info' style='display:none'>" + json.dumps(frame_info) + "</p>"
-    annotation_html += "<img id='annotation_img' onload='draw()' style='display:none'></img>"
 
     # Send update to UI, and to inference_handler to start next file inference
     return {
@@ -172,11 +175,24 @@ def show_data():
 
 
     
+def testing():
+    codec = cv2.VideoWriter_fourcc(*'avc1')
+    cv2.VideoWriter("static/test.mp4", codec, 10, [ int(1.5*100), 100 ] )
+    print("hi")
+testing()
 
-def preview_result(zip_info):
+def preview_result(zip_info, aris_info):
     zip_name = zip_info[0]
     print(zip_name)
-    dir_name = create_data_dir()
+    if (aris_info):
+        print(aris_info[0])
+        file_name = aris_info[0].split("/")[-1]
+        bytes = aris_info[1]
+        valid, file_path, dir_name = save_data(bytes, file_name)
+    else:
+        dir_name = create_data_dir()
+        file_path = None
+
     with ZipFile(zip_name) as zip_file:
         ZipFile.extractall(zip_file, path=dir_name)
 
@@ -193,9 +209,10 @@ def preview_result(zip_info):
         elif (file.endswith("_marking.txt")):
             result["path_marking"].append(os.path.join(dir_name, file))
     
+    result["aris_input"].append(file_path)
     with open(result['path_json'][0]) as f:
         json_result = json.load(f)
-        result['json_result'] = json_result
+        result['json_result'].append(json_result)
     fish_table, fish_info = create_metadata_table(json_result, table_headers, info_headers)
     result["fish_table"].append(fish_table)
     result["fish_info"].append(fish_info)
@@ -236,8 +253,12 @@ with demo:
 
             with gr.Tab("Review Results"):
                 # Title of page
-                gr.HTML("<p align='center' style='font-size: large;font-style: italic;'>Submit an old zip file of results to visualize.</p>")
+                gr.HTML("""
+                    <p align='center' style='font-size: large;font-style: italic;'>Submit an old zip file of results to visualize.</p>
+                    <p align='center' style='font-size: large;font-style: italic;'>If you want to edit annotations, also submit an aris file.</p>
+                """)
                 result_input = File(file_types=[".zip"], type="binary", label="Upload result file")
+                result_aris_input = File(file_types=[".aris", ".ddf"], type="binary", label="Upload aris file (optional)")
                 preview_result_btn = gr.Button("Preview Result")
 
 
@@ -295,7 +316,7 @@ with demo:
     result_handler.change(show_data, None, UI_components + [inference_handler], _js=js_update_tabs)
     
     # Button to load a previous result and view visualization
-    preview_result_btn.click(preview_result, result_input, [result_handler, inference_handler])
+    preview_result_btn.click(preview_result, [result_input, result_aris_input], [result_handler, inference_handler, preview_result_btn])
 
 demo.queue().launch()
 

state_handler.py

@@ -364,6 +364,7 @@ def reset_state(result, state):
 
     # Reset Result
     result["json_result"] = []
+    result["aris_input"] = []
     result["path_video"] = []
     result["path_zip"] = []
     result["path_json"] = []