administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-05 18:55:23 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Nick Mowen 2023-07-06 07:38:34 -06:00
parent 7d61b52e9f
commit 492be9aeca
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frigate/app.py
View File

@ -47,7 +47,7 @@ from frigate.stats import StatsEmitter, stats_init
from frigate.storage import StorageMaintainer from frigate.storage import StorageMaintainer
from frigate.timeline import TimelineProcessor from frigate.timeline import TimelineProcessor
from frigate.types import CameraMetricsTypes, FeatureMetricsTypes from frigate.types import CameraMetricsTypes, FeatureMetricsTypes
from frigate.util import LimitedQueue as LQueue from frigate.util.builtin import LimitedQueue as LQueue
from frigate.version import VERSION from frigate.version import VERSION
from frigate.video import capture_camera, track_camera from frigate.video import capture_camera, track_camera
from frigate.watchdog import FrigateWatchdog from frigate.watchdog import FrigateWatchdog

20
frigate/util/image.py
View File

@ -1,34 +1,14 @@
<<<<<<< HEAD:frigate/util/image.py
"""Utilities for creating and manipulating image frames.""" """Utilities for creating and manipulating image frames."""
=======
import copy
import ctypes
>>>>>>> 2fae9dcb93f41936ee1907fc0813719c8559fe1b:frigate/util.py
import datetime import datetime
import logging import logging
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from multiprocessing import shared_memory from multiprocessing import shared_memory
<<<<<<< HEAD:frigate/util/image.py
from typing import AnyStr, Optional from typing import AnyStr, Optional
import cv2 import cv2
import numpy as np import numpy as np
=======
from queue import Empty, Full
from typing import Any, AnyStr, Optional, Tuple
import cv2
import numpy as np
import psutil
import py3nvml.py3nvml as nvml
import pytz
import yaml
from frigate.const import REGEX_HTTP_CAMERA_USER_PASS, REGEX_RTSP_CAMERA_USER_PASS
>>>>>>> 2fae9dcb93f41936ee1907fc0813719c8559fe1b:frigate/util.py
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)