Fix camera module error handling and remove unnecessary transform#114400
Merged
akien-mga merged 1 commit intogodotengine:masterfrom Jan 5, 2026
Merged
Fix camera module error handling and remove unnecessary transform#114400akien-mga merged 1 commit intogodotengine:masterfrom
akien-mga merged 1 commit intogodotengine:masterfrom
Conversation
shiena
force-pushed
the
fix/camera_macos
branch
2 times, most recently
from
5ee5421 to
3f2a56b
Compare
bruvzg
approved these changes
Jan 5, 2026
Member
|
Please squash the commits, see The interactive rebase. |
- Add null check for pixelBuffer in camera callback - Return nil from capture session init on input/output failure - Fix activate_feed return value and handle permission denied/restricted - Deactivate camera feeds before removal Add plane count check before accessing pixel buffer planes to handle unexpected buffer formats gracefully. Also improve null checks to use one-time logging and properly unlock the buffer before returning on error.
shiena
force-pushed
the
fix/camera_macos
branch
from
3f2a56b to
0918da0
Compare
Contributor
Author
|
Squashed. |
Member
|
Thanks! |
rivie13
pushed a commit
to rivie13/Phoenix-Agentic-Engine
that referenced
this pull request
Feb 16, 2026
Fix camera module error handling and remove unnecessary transform
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #114399
Fixes several issues in the macOS camera module:
Unnecessary transform removed:
Transform2D(-1.0, 0.0, 0.0, -1.0, 1.0, 1.0)inCameraMacOS::update_feeds()that caused incorrect rotation/mirroring on MacBooksError handling improvements:
activate_feed()now returns proper status instead of always returningtrueMyCaptureSession initForFeed:andDevice:when input/output device acquisition failspixelBufferincaptureOutput:didOutputSampleBuffer:fromConnection:AVAuthorizationStatusDeniedandAVAuthorizationStatusRestrictedCVPixelBufferunlock before returning on errorResource lifecycle improvements:
~CameraFeedMacOS()to properly clean up the capture session when the feed is destroyedupdate_feeds()before removing them to prevent resource leaks