-
Notifications
You must be signed in to change notification settings - Fork 41
Add /api/camera/stream endpoint for MJPEG video streaming #405
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.
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
Open
tfrere
wants to merge
3
commits into
develop
Choose a base branch
from
feat/expose-camera-stream
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+73
−2
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| """Camera streaming API routes.""" | ||
|
|
||
| import asyncio | ||
| from typing import AsyncGenerator | ||
|
|
||
| import cv2 | ||
| from fastapi import APIRouter, Depends | ||
| from fastapi.responses import StreamingResponse | ||
|
|
||
| from reachy_mini.media.camera_constants import CameraResolution | ||
| from reachy_mini.media.camera_opencv import OpenCVCamera | ||
|
|
||
| from ...backend.abstract import Backend | ||
| from ...backend.mujoco.backend import MujocoBackend | ||
| from ...daemon import Daemon | ||
| from ..dependencies import get_backend, get_daemon | ||
|
|
||
| router = APIRouter(prefix="/camera") | ||
|
|
||
| _shared_camera: OpenCVCamera | None = None | ||
| _camera_refs = 0 | ||
|
|
||
|
|
||
| async def _get_shared_camera(is_sim: bool) -> OpenCVCamera: | ||
| """Get or create shared camera instance.""" | ||
| global _shared_camera, _camera_refs | ||
| if _shared_camera is None: | ||
| _shared_camera = OpenCVCamera(log_level="WARNING", resolution=CameraResolution.R1280x720) | ||
| _shared_camera.open(udp_camera="udp://@127.0.0.1:5005" if is_sim else None) | ||
| _camera_refs += 1 | ||
| return _shared_camera | ||
|
|
||
|
|
||
| def _release_camera() -> None: | ||
| """Release camera reference and close if no more clients.""" | ||
| global _shared_camera, _camera_refs | ||
| _camera_refs -= 1 | ||
| if _camera_refs <= 0 and _shared_camera is not None: | ||
| _shared_camera.close() | ||
| _shared_camera = None | ||
| _camera_refs = 0 | ||
|
|
||
|
||
|
|
||
| @router.get("/stream") | ||
| async def stream_camera( | ||
| backend: Backend = Depends(get_backend), | ||
| daemon: Daemon = Depends(get_daemon), | ||
| ) -> StreamingResponse: | ||
| """Stream camera feed as MJPEG.""" | ||
|
|
||
| async def _stream() -> AsyncGenerator[bytes, None]: | ||
| is_sim = bool( | ||
| daemon.status().simulation_enabled and isinstance(backend, MujocoBackend) | ||
| ) | ||
| cam = await _get_shared_camera(is_sim) | ||
| try: | ||
| while True: | ||
| f = cam.read() | ||
| if f is not None: | ||
| f = cv2.resize(f, (640, 480)) | ||
| _, j = cv2.imencode(".jpg", f, [cv2.IMWRITE_JPEG_QUALITY, 80]) | ||
| if _: | ||
| yield b"--frame\r\nContent-Type: image/jpeg\r\n\r\n" + j.tobytes() + b"\r\n" | ||
| await asyncio.sleep(0.04) | ||
| finally: | ||
| _release_camera() | ||
|
|
||
| return StreamingResponse(_stream(), media_type="multipart/x-mixed-replace; boundary=frame") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Global state management without thread safety. The
_shared_cameraand_camera_refsvariables are accessed and modified by multiple concurrent requests without synchronization (e.g., locks). This can lead to race conditions where:_shared_camera is Noneand create multiple camera instancesConsider using
asyncio.Lockorthreading.Lockto protect these shared variables.