Skip to content

[cscore] Fix USB video mode handling on macOS #7904

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

Merged
ThadHouse merged 2 commits into from
Apr 21, 2025
Merged

[cscore] Fix USB video mode handling on macOS #7904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54e7fb5
fix: UsbCameraImpl on macOS
yuhao1118 Apr 14, 2025
2cc1108
fix: add back logs
yuhao1118 Apr 14, 2025
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
1 change: 0 additions & 1 deletion cscore/src/main/native/objcpp/UsbCameraImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,5 @@ class UsbCameraImpl : public SourceImpl {
private:
UsbCameraImplObjc* m_objc;
std::vector<CameraModeStore> m_platformModes;
VideoMode m_mode;
};
} // namespace cs
27 changes: 16 additions & 11 deletions cscore/src/main/native/objcpp/UsbCameraImplObjc.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,22 +380,27 @@ - (AVCaptureDeviceFormat*)deviceCheckModeValid:(const cs::VideoMode*)toCheck
toCheck->height, toCheck->fps);
std::vector<CameraModeStore>& platformModes =
sharedThis->objcGetPlatformVideoModes();
// Find the matching mode
auto match = std::find_if(platformModes.begin(), platformModes.end(),
[&](CameraModeStore& input) {
return input.mode.CompareWithoutFps(*toCheck);
});

// Find all matching modes
std::vector<CameraModeStore*> matchingModes;
for (auto& mode : platformModes) {
if (mode.mode.CompareWithoutFps(*toCheck)) {
matchingModes.push_back(&mode);
}
}

if (match == platformModes.end()) {
if (matchingModes.empty()) {
return nil;
}

// Check FPS
for (CameraFPSRange& range : match->fpsRanges) {
OBJCDEBUG3("Checking Range {} {}", range.min, range.max);
if (range.IsWithinRange(toCheck->fps)) {
*fps = toCheck->fps;
return match->format;
for (auto mode : matchingModes) {
for (CameraFPSRange& range : mode->fpsRanges) {
OBJCDEBUG3("Checking Range {} {}", range.min, range.max);
if (range.IsWithinRange(toCheck->fps)) {
*fps = toCheck->fps;
return mode->format;
}
}
}

Expand Down
Loading