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 an issue that the Live function where the camera was not released when the user closed the live window. 

Signed-off-by: Vic P <vic4key@gmail.com>
pull/293/head
Vic P 2024-08-14 00:48:01 +07:00
parent 408b0f4cf7
commit 55c8d8181c
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/ui.py
View File

@ -39,6 +39,7 @@ status_label = None
img_ft, vid_ft = modules.globals.file_types img_ft, vid_ft = modules.globals.file_types
camera = None
def check_camera_permissions(): def check_camera_permissions():
"""Check and request camera access permission on macOS.""" """Check and request camera access permission on macOS."""
@ -274,6 +275,11 @@ def toggle_preview() -> None:
init_preview() init_preview()
update_preview() update_preview()
PREVIEW.deiconify() PREVIEW.deiconify()
global camera
if PREVIEW.state() == 'withdrawn':
if camera and camera.isOpened():
camera.release()
camera = None
def init_preview() -> None: def init_preview() -> None:
@ -319,15 +325,16 @@ def webcam_preview(camera_name: str):
# Use OpenCV's camera index for cross-platform compatibility # Use OpenCV's camera index for cross-platform compatibility
camera_index = get_camera_index_by_name(camera_name) camera_index = get_camera_index_by_name(camera_name)
cap = cv2.VideoCapture(camera_index) global camera
camera = cv2.VideoCapture(camera_index)
if not cap.isOpened(): if not camera.isOpened():
update_status(f"Error: Could not open camera {camera_name}") update_status(f"Error: Could not open camera {camera_name}")
return return
cap.set(cv2.CAP_PROP_FRAME_WIDTH, 960) camera.set(cv2.CAP_PROP_FRAME_WIDTH, 960)
cap.set(cv2.CAP_PROP_FRAME_HEIGHT, 540) camera.set(cv2.CAP_PROP_FRAME_HEIGHT, 540)
cap.set(cv2.CAP_PROP_FPS, 60) camera.set(cv2.CAP_PROP_FPS, 60)
PREVIEW_MAX_WIDTH = 960 PREVIEW_MAX_WIDTH = 960
PREVIEW_MAX_HEIGHT = 540 PREVIEW_MAX_HEIGHT = 540
@ -338,8 +345,8 @@ def webcam_preview(camera_name: str):
frame_processors = get_frame_processors_modules(modules.globals.frame_processors) frame_processors = get_frame_processors_modules(modules.globals.frame_processors)
source_image = get_one_face(cv2.imread(modules.globals.source_path)) source_image = get_one_face(cv2.imread(modules.globals.source_path))
while True: while camera:
ret, frame = cap.read() ret, frame = camera.read()
if not ret: if not ret:
update_status(f"Error: Frame not received from camera.") update_status(f"Error: Frame not received from camera.")
break break
@ -355,7 +362,7 @@ def webcam_preview(camera_name: str):
preview_label.configure(image=image) preview_label.configure(image=image)
ROOT.update() ROOT.update()
cap.release() if camera: camera.release()
PREVIEW.withdraw() PREVIEW.withdraw()