diff --git a/core/spout.py b/core/spout.py index a34824c..45b9fe1 100644 --- a/core/spout.py +++ b/core/spout.py @@ -1,15 +1,11 @@ -""" -Jovi_Spout - Device -- SPOUT -""" +""" Jovi_Spout - Device -- SPOUT """ import time import array import threading -from enum import Enum from typing import Tuple from itertools import repeat -import cv2 import torch import SpoutGL import numpy as np @@ -27,18 +23,8 @@ from cozy_comfyui.node import \ from cozy_comfyui.image.convert import \ cv_to_tensor_full, tensor_to_cv, image_convert -# ============================================================================== -# === ENUMERATION === -# ============================================================================== - -class EnumInterpolation(Enum): - NEAREST = cv2.INTER_NEAREST - LINEAR = cv2.INTER_LINEAR - CUBIC = cv2.INTER_CUBIC - AREA = cv2.INTER_AREA - LANCZOS4 = cv2.INTER_LANCZOS4 - LINEAR_EXACT = cv2.INTER_LINEAR_EXACT - NEAREST_EXACT = cv2.INTER_NEAREST_EXACT +from cozy_comfyui.image.misc import \ + image_resize # ============================================================================== # === CLASS === @@ -109,8 +95,7 @@ Capture frames from Spout streams. It supports batch processing, allowing multip receiver.setFrameSync(url) pbar.update_absolute(idx) - frames = [cv_to_tensor_full(cv2.resize(i, (width, height), - interpolation=sample)) for i in frames] + frames = [cv_to_tensor_full(image_resize(i, width, height, sample)) for i in frames] return [torch.stack(i) for i in zip(*frames)] class SpoutWriterNode(CozyBaseNode): diff --git a/pyproject.toml b/pyproject.toml index 26d1006..3386047 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,6 @@ dependencies = [ "aenum", "git+https://github.com/cozy-comfyui/cozy_comfyui@main#egg=cozy_comfyui", "numpy<2", - "opencv-contrib-python", "PyOpenGL", "PyOpenGL-accelerate; python_version < '3.12'", "SpoutGL; platform_system==\"Windows\"", diff --git a/requirements.txt b/requirements.txt index 6de12d2..2f6c257 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ aenum git+https://github.com/cozy-comfyui/cozy_comfyui@main#egg=cozy_comfyui numpy<2 -opencv-contrib-python PyOpenGL PyOpenGL-accelerate; python_version < '3.12' SpoutGL; platform_system=="Windows"