Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor ff queue size #7116

Merged
merged 3 commits into from
Jul 14, 2023
Merged

Refactor ff queue size #7116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4f0b6c
Refactor queue size
NickM-27 Jul 11, 2023
d7d65be
Only use enabled cameras
NickM-27 Jul 11, 2023
570e1fc
Formatting
NickM-27 Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions frigate/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,22 +199,34 @@ def set_log_levels(self) -> None:

def init_queues(self) -> None:
# Queues for clip processing
self.event_queue: Queue = ff.Queue(DEFAULT_QUEUE_BUFFER_SIZE)
self.event_processed_queue: Queue = ff.Queue(DEFAULT_QUEUE_BUFFER_SIZE)
self.event_queue: Queue = ff.Queue(
DEFAULT_QUEUE_BUFFER_SIZE
* sum(camera.enabled for camera in self.config.cameras.values())
)
self.event_processed_queue: Queue = ff.Queue(
DEFAULT_QUEUE_BUFFER_SIZE
* sum(camera.enabled for camera in self.config.cameras.values())
)
self.video_output_queue: Queue = mp.Queue(
maxsize=len(self.config.cameras.keys()) * 2
maxsize=sum(camera.enabled for camera in self.config.cameras.values()) * 2
)

# Queue for cameras to push tracked objects to
self.detected_frames_queue: Queue = mp.Queue(
maxsize=len(self.config.cameras.keys()) * 2
maxsize=sum(camera.enabled for camera in self.config.cameras.values()) * 2
)

# Queue for recordings info
self.recordings_info_queue: Queue = ff.Queue(DEFAULT_QUEUE_BUFFER_SIZE)
self.recordings_info_queue: Queue = ff.Queue(
DEFAULT_QUEUE_BUFFER_SIZE
* sum(camera.enabled for camera in self.config.cameras.values())
)

# Queue for timeline events
self.timeline_queue: Queue = ff.Queue(DEFAULT_QUEUE_BUFFER_SIZE)
self.timeline_queue: Queue = ff.Queue(
DEFAULT_QUEUE_BUFFER_SIZE
* sum(camera.enabled for camera in self.config.cameras.values())
)

def init_database(self) -> None:
def vacuum_db(db: SqliteExtDatabase) -> None:
Expand Down
2 changes: 1 addition & 1 deletion frigate/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@

# Queue Values

DEFAULT_QUEUE_BUFFER_SIZE = 2000 * 1000 # 2MB
DEFAULT_QUEUE_BUFFER_SIZE = 1000 * 1000 # 1MB
2 changes: 1 addition & 1 deletion frigate/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ def create_event(camera_name, label):
except Exception as e:
return make_response(
jsonify({"success": False, "message": f"An unknown error occurred: {e}"}),
404,
500,
)

return make_response(
Expand Down