diaojiaolou
/
Deep-Live-Cam
mirror of https://github.com/hacksider/Deep-Live-Cam.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: Prevent immediate stop/crash in live preview if source image is invalid. 

- Modified `create_webcam_preview` in `modules/ui.py` to handle errors during source image loading (e.g., file not readable, no face detected) more gracefully.
- Instead of stopping the live preview, it now shows a warning message and starts the live camera feed without face swapping if the source image is unusable.
- This addresses the issue where clicking 'Live' after selecting a problematic source image would cause the preview to stop or crash immediately.
pull/1380/head
google-labs-jules[bot] 2025-06-27 20:25:26 +00:00
parent eb33df659b
commit d00af5a995
1 changed files with 101 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
modules/ui.py
View File

@ -880,42 +880,80 @@ def create_webcam_preview(camera_index: int):
PREVIEW.deiconify()
frame_processors = get_frame_processors_modules(modules.globals.frame_processors)
# Get initial source image if not mapping faces
source_image = None
prev_time = time.time()
fps_update_interval = 0.5
frame_count = 0
fps = 0
if not modules.globals.map_faces and modules.globals.source_path:
try:
loaded_cv_image = cv2.imread(modules.globals.source_path)
if loaded_cv_image is None:
update_status(f"Error: Could not read source image at {modules.globals.source_path}")
# source_image remains None
else:
source_image = get_one_face(loaded_cv_image)
if source_image is None:
update_status(f"Error: No face detected in source image {os.path.basename(modules.globals.source_path)}")
except Exception as e:
update_status(f"Exception loading source image: {str(e)[:100]}")
source_image = None # Ensure source_image is None on any error
# If source_image is still None AND a source_path was provided (meaning user intended a swap)
# AND we are not using map_faces (which handles its own source logic for sources)
if source_image is None and modules.globals.source_path and not modules.globals.map_faces:
update_status("Warning: Live preview started, but source image is invalid or has no face. No swap will occur.")
# The live preview will start, but no swap will occur if source_image is None.
# Start the update loop
fps_data = { # Moved fps_data initialization here to be passed to the loop
"prev_time": time.time(),
"frame_count": 0,
"fps": 0.0,
"fps_update_interval": 0.5
}
update_webcam_frame_after(cap, frame_processors, source_image, fps_data)
def update_webcam_frame_after(cap, frame_processors, source_image, fps_data, delay_ms=15): # Approx 66 FPS target for UI updates
global preview_label, ROOT, PREVIEW
if PREVIEW.state() == "withdrawn":
cap.release()
PREVIEW.withdraw() # Ensure it's withdrawn if loop exits
return
while True:
ret, frame = cap.read()
if not ret:
break
# Handle camera read failure or end of stream (though for webcam, it's usually continuous)
ROOT.after(delay_ms, lambda: update_webcam_frame_after(cap, frame_processors, source_image, fps_data, delay_ms))
return
temp_frame = frame.copy()
if modules.globals.live_mirror:
temp_frame = cv2.flip(temp_frame, 1)
if modules.globals.live_resizable:
temp_frame = fit_image_to_size(
temp_frame, PREVIEW.winfo_width(), PREVIEW.winfo_height()
)
# Resizing based on PREVIEW window dimensions.
preview_width = PREVIEW.winfo_width()
preview_height = PREVIEW.winfo_height()
if preview_width > 1 and preview_height > 1: # Ensure valid dimensions
temp_frame = fit_image_to_size(temp_frame, preview_width, preview_height)
else:
temp_frame = fit_image_to_size(
temp_frame, PREVIEW.winfo_width(), PREVIEW.winfo_height()
)
if not modules.globals.map_faces:
if source_image is None and modules.globals.source_path:
source_image = get_one_face(cv2.imread(modules.globals.source_path))
current_source_image = source_image
if current_source_image is None and modules.globals.source_path:
try:
current_source_image = get_one_face(cv2.imread(modules.globals.source_path))
except:
pass
for frame_processor in frame_processors:
if frame_processor.NAME == "DLC.FACE-ENHANCER":
if modules.globals.fp_ui["face_enhancer"]:
temp_frame = frame_processor.process_frame(None, temp_frame)
else:
temp_frame = frame_processor.process_frame(source_image, temp_frame)
if current_source_image:
temp_frame = frame_processor.process_frame(current_source_image, temp_frame)
else:
modules.globals.target_path = None
for frame_processor in frame_processors:
@ -925,18 +963,19 @@ def create_webcam_preview(camera_index: int):
else:
temp_frame = frame_processor.process_frame_v2(temp_frame)
# Calculate and display FPS
current_time = time.time()
frame_count += 1
if current_time - prev_time >= fps_update_interval:
fps = frame_count / (current_time - prev_time)
frame_count = 0
prev_time = current_time
fps_data["frame_count"] += 1
time_diff = current_time - fps_data["prev_time"]
if time_diff >= fps_data.get("fps_update_interval", 0.5):
fps_data["fps"] = fps_data["frame_count"] / time_diff
fps_data["frame_count"] = 0
fps_data["prev_time"] = current_time
if modules.globals.show_fps:
cv2.putText(
temp_frame,
f"FPS: {fps:.1f}",
f"FPS: {fps_data['fps']:.1f}",
(10, 30),
cv2.FONT_HERSHEY_SIMPLEX,
1,
@ -944,20 +983,19 @@ def create_webcam_preview(camera_index: int):
2,
)
if temp_frame is not None and temp_frame.size > 0:
image = cv2.cvtColor(temp_frame, cv2.COLOR_BGR2RGB)
image = Image.fromarray(image)
image = ImageOps.contain(
image, (temp_frame.shape[1], temp_frame.shape[0]), Image.LANCZOS
pil_image = Image.fromarray(image)
contained_image = ImageOps.contain(
pil_image, (temp_frame.shape[1], temp_frame.shape[0]), Image.LANCZOS
)
image = ctk.CTkImage(image, size=image.size)
preview_label.configure(image=image)
ROOT.update()
ctk_image = ctk.CTkImage(contained_image, size=contained_image.size)
preview_label.configure(image=ctk_image)
else:
pass
if PREVIEW.state() == "withdrawn":
break
cap.release()
PREVIEW.withdraw()
ROOT.after(delay_ms, lambda: update_webcam_frame_after(cap, frame_processors, source_image, fps_data, delay_ms))
def create_source_target_popup_for_webcam(