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

fixed variable names not matching after merge conflict resolution from upstream

pull/329/head
Aleksandr Spiridonov 2024-08-15 12:22:19 -04:00
parent b8cdad5cce
commit 575373beac
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ui.py
View File

@ -318,10 +318,10 @@ def update_preview(frame_number: int = 0) -> None:
image = ctk.CTkImage(image, size=image.size) image = ctk.CTkImage(image, size=image.size)
preview_label.configure(image=image) preview_label.configure(image=image)
def webcam_preview_loop(cap: cv2.VideoCapture, source_image: Any, frame_processors: List[ModuleType], virtual_cam: pyvirtualcam.Camera = None) -> bool: def webcam_preview_loop(camera: cv2.VideoCapture, source_image: Any, frame_processors: List[ModuleType], virtual_cam: pyvirtualcam.Camera = None) -> bool:
global preview_label, PREVIEW global preview_label, PREVIEW
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.")
return False return False
@ -409,12 +409,10 @@ def webcam_preview(camera_name: str, virtual_cam_output: bool):
if virtual_cam_output: if virtual_cam_output:
with pyvirtualcam.Camera(width=WIDTH, height=HEIGHT, fps=FPS, fmt=pyvirtualcam.PixelFormat.BGR) as virtual_cam: with pyvirtualcam.Camera(width=WIDTH, height=HEIGHT, fps=FPS, fmt=pyvirtualcam.PixelFormat.BGR) as virtual_cam:
while preview_running: while preview_running:
preview_running = webcam_preview_loop(cap, source_image, frame_processors, virtual_cam) preview_running = webcam_preview_loop(camera, source_image, frame_processors, virtual_cam)
while preview_running: while preview_running:
preview_running = webcam_preview_loop(cap, source_image, frame_processors) preview_running = webcam_preview_loop(camera, source_image, frame_processors)
if camera: camera.release() if camera: camera.release()
PREVIEW.withdraw() PREVIEW.withdraw()