Camera Factory Pattern Adoption #64
Merged
Conversation
This file contains 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
Contributor
bantuerfei0
commented
Nov 14, 2024
bantuerfei0
commented
- Removed the ability for cameras to save images, instead they just return data and it is up to the caller to save the data
- Added implementations for the opencv and picamera2 (UNTESTED) camera
- Added CameraOption enum (CAM_OPENCV, CAM_PICAM2) to camera_factory.py
- Added create_camera(CameraOption, width, height) function to camera_factory.py
- Both untested, however the opencv implementation should be identical to the previous iteration
|
Note: include import checks inside create_camera() function, not the implementations themselves...? |
Xierumeng
reviewed
Nov 17, 2024
modules/camera/base_camera.py
Outdated
| class BaseCameraDevice(ABC): | ||
| """ | ||
| Abstract class for camera device implementations. | ||
| TODO: could leverage the abc library's tags more (required properties/methods/etc.) |
There was a problem hiding this comment.
Why not do this now in this PR?
There was a problem hiding this comment.
Nevermind, just read up on it and the abstractproperty decorator is deprecated since python 3.3
We can just use the @Property decorator. However, I believe camera is supposed to be "private"
Xierumeng
reviewed
Nov 17, 2024
The picamera2 library seems to throw RuntimeError if anything goes wrong, so wrapping the camera creation in a try-except block. Picamera2 fails capture_array() the same way opencv would for read() Changed the configuration for the picamera2 camera to use a still configuration. TL;DR most configurations are similar in parameters, except for buffer size. See manual/source for more
|
Integration tests are failing, going to go to work session today to fix |
Tested OpenCV integration test Tested QR Code integration test Pending Picamera2 integration test Renamed get_camera_data function inside cameras to "run" Fixed type hinting error in picamera2 implementation Other small changes
bantuerfei0
force-pushed
the
camera-factory-pattern
branch
from
5275686
to
51fa66c
Compare
maxlou05
reviewed
Nov 28, 2024
| camera = picamera2.Picamera2() | ||
|
|
||
| config = camera.create_still_configuration( | ||
| {"size": (width, height), "format": "RGB888"} |
There was a problem hiding this comment.
Can you add parameters for "ExposureTime" and "AnalogueGain"? We will need to set these for the IR camera detection
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.