Update app.py

app.py

@@ -227,129 +227,125 @@ def process_clip_from_file(prompt, frames, chatbot, fps, video_path, id):
     
     return chatbot
 
-# Function to capture video frames
-def analyze_stream(prompt, chatbot):
-    global stop_capture
-    global base_start_time
-    stop_capture = False
-    extra_frames = 6
-    half_hour_in_secs = 1800 # video length
-    video_start = (int(time.time() - base_start_time) % half_hour_in_secs) + extra_frames
+# # Function to capture video frames
+# def analyze_stream(prompt, chatbot):
+#     global stop_capture
+#     global base_start_time
+#     stop_capture = False
+#     half_hour_in_secs = 1800 # long sf junction video length
+#     video_start = int(int(time.time() - base_start_time) % half_hour_in_secs)
     
-    # stream = "https://streamapi2.eu.loclx.io/video_feed/101"
-    stream = VIDEO_PATH
-    cap = cv2.VideoCapture(stream or WEBCAM)
-    fps = cap.get(cv2.CAP_PROP_FPS)
-    # cap.set(cv2.CAP_PROP_POS_FRAMES, int(video_start*fps))
-    cap.set(cv2.CAP_PROP_POS_FRAMES, int(20 * 24))
+#     # stream = "https://streamapi2.eu.loclx.io/video_feed/101"
+#     stream = VIDEO_PATH
+#     cap = cv2.VideoCapture(stream or WEBCAM)
+#     fps = cap.get(cv2.CAP_PROP_FPS)
+#     # cap.set(cv2.CAP_PROP_POS_FRAMES, int(video_start*fps))
+#     cap.set(cv2.CAP_PROP_POS_FRAMES, int(20 * 24))
 
-    print("Video start", video_start, fps, base_start_time)
+#     print("Video start", video_start, fps, base_start_time)
 
-    frames = []
-    start_time = time.time()
-    id = video_start
-    while not stop_capture:
-        ret, frame = cap.read()
-        # if not ret:
-        #     cap.set(cv2.CAP_PROP_POS_FRAMES, 0)
-        frames.append(frame)
+#     frames = []
+#     start_time = time.time()
+#     id = video_start
+#     while not stop_capture:
+#         ret, frame = cap.read()
+#         # if not ret:
+#         #     cap.set(cv2.CAP_PROP_POS_FRAMES, 0)
+#         frames.append(frame)
         
-        # Sample the frames every 5 seconds
-        if time.time() - start_time >= LENGTH:
-            # Start a new thread for processing the video clip
-            Thread(target=process_clip, args=(prompt, frames.copy(), chatbot, id)).start()
-            frames = []
-            start_time = time.time()
-            id=id+1
-        yield chatbot
-
-    cap.release()
-    return chatbot
-
+#         # Sample the frames every 5 seconds
+#         if time.time() - start_time >= LENGTH:
+#             # Start a new thread for processing the video clip
+#             Thread(target=process_clip, args=(prompt, frames.copy(), chatbot, id)).start()
+#             frames = []
+#             start_time = time.time()
+#             id=id+1
+#         yield chatbot
 
-# def analyze_stream(prompt, chatbot):
-#     global stop_capture
-#     global base_start_time
+#     cap.release()
+#     return chatbot
 
-#     stop_capture = False
-#     # Calculate how many seconds in we want to start (example: 6 + modulo logic)
-#     extra_frames = 6
-#     video_start = (int(time.time() - base_start_time) % 1800) + extra_frames
 
-#     # OpenCV video source; could be local file or http(s) link
-#     stream = VIDEO_PATH
-#     cap = cv2.VideoCapture(stream or WEBCAM)
+def analyze_stream(prompt, chatbot):
+    global stop_capture
+    global base_start_time
 
-#     fps = cap.get(cv2.CAP_PROP_FPS)
-#     if fps <= 0:
-#         # Fallback, in case the FPS is reported as 0 or negative
-#         fps = 24.0
+    stop_capture = False
+    extra_frames = 6
+    video_start = int(int(time.time() - base_start_time) % 1800)
 
-#     # Convert `video_start` (in seconds) to frames
-#     start_frame = int(video_start * fps)
-#     print("Desired start_frame =", start_frame)
-#     print("Video start, fps, base_start_time =", video_start, fps, base_start_time)
+    stream = VIDEO_PATH
+    cap = cv2.VideoCapture(stream or WEBCAM)
 
-#     print("Local file detected. Attempting direct frame seek...")
+    fps = cap.get(cv2.CAP_PROP_FPS)
+    if fps <= 0:
+        print("[DEBUG]: Could not find FPS")
+        # Fallback, in case the FPS is reported as 0 or negative
+        fps = 24.0
+
+    # Convert `video_start` (in seconds) to frames
+    start_frame = int(video_start * fps)
+    print("[DEBUG]: Desired start_frame =", start_frame)
+    print("[DEBUG]: Video start, fps, base_start_time =", video_start, fps, base_start_time)
     
-#     # Attempt to seek
-#     # success = cap.set(cv2.CAP_PROP_POS_FRAMES, start_frame)
+    # Attempt to seek
+    # success = cap.set(cv2.CAP_PROP_POS_FRAMES, start_frame)
     
-#     for _ in range(start_frame):
-#             ret, _ = cap.read()
+    for _ in range(start_frame):
+            ret, _ = cap.read()
 
-#     # Check if seeking was actually successful by reading a frame
-#     ret, test_frame = cap.read()
+    # Check if seeking was actually successful by reading a frame
+    ret, test_frame = cap.read()
     
-#     # if not success or not ret:
-#     #     # If seeking failed, fall back to manual skipping
-#     #     print(f"Direct seek to frame {start_frame} failed. Falling back to manual skipping.")
-#     #     # Reset capture to start
-#     #     cap.release()
-#     #     cap = cv2.VideoCapture(stream)
-#     #     # Skip frames manually
-#     #     for _ in range(start_frame):
-#     #         ret, _ = cap.read()
-#     #         if not ret:
-#     #             print("Failed before reaching start_frame (manual skip).")
-#     #             break
-#     #     # We'll use 'test_frame' from the final read below
-#     #     ret, test_frame = cap.read()
+    # if not success or not ret:
+    #     # If seeking failed, fall back to manual skipping
+    #     print(f"Direct seek to frame {start_frame} failed. Falling back to manual skipping.")
+    #     # Reset capture to start
+    #     cap.release()
+    #     cap = cv2.VideoCapture(stream)
+    #     # Skip frames manually
+    #     for _ in range(start_frame):
+    #         ret, _ = cap.read()
+    #         if not ret:
+    #             print("Failed before reaching start_frame (manual skip).")
+    #             break
+    #     # We'll use 'test_frame' from the final read below
+    #     ret, test_frame = cap.read()
 
-#     frames = []
-#     start_time = time.time()
-#     clip_id = video_start
+    frames = []
+    start_time = time.time()
+    clip_id = video_start
     
-#     print("Starting capture from the current position now.")
-#     if ret and test_frame is not None:
-#         # We already read one frame after seeking, so store it
-#         frames.append(test_frame)
+    print("Starting capture from the current position now.")
+    if ret and test_frame is not None:
+        # We already read one frame after seeking, so store it
+        frames.append(test_frame)
 
 
 
-#     while not stop_capture:
-#         ret, frame = cap.read()
-#         if not ret:
-#             # You could optionally try restarting if desired
-#             print("No more frames or read error; stopping.")
-#             break
+    while not stop_capture:
+        ret, frame = cap.read()
+        if not ret:
+            # You could optionally try restarting if desired
+            print("No more frames or read error; stopping.")
+            break
 
-#         frames.append(frame)
+        frames.append(frame)
 
-#         # Sample the frames every LENGTH seconds
-#         if time.time() - start_time >= LENGTH:
-#             # Start a new thread for processing the video clip
-#             print("analyze_stream.clip_id", clip_id)
-#             Thread(target=process_clip, args=(prompt, frames.copy(), chatbot, clip_id)).start()
-#             frames = []
-#             start_time = time.time()
-#             clip_id += 1
+        # Sample the frames every LENGTH seconds
+        if (time.time() - start_time) >= LENGTH:
+            # Start a new thread for processing the video clip
+            print("analyze_stream.clip_id", clip_id)
+            Thread(target=process_clip, args=(prompt, frames.copy(), chatbot, clip_id)).start()
+            frames = []
+            start_time = time.time()
+            clip_id += 1
 
-#         # Yield to the UI or chatbot loop
-#         yield chatbot
+        # Yield to the UI or chatbot loop
+        yield chatbot
 
-#     cap.release()
-#     return chatbot
+    cap.release()
+    return chatbot
 
 
 def analyze_video_file(prompt, chatbot):