Skip to content

Support CameraFeed format on macOS #106777

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+89 −2
Open

Support CameraFeed format on macOS #106777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
91 changes: 89 additions & 2 deletions modules/camera/camera_macos.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
// do Y
size_t new_width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 0);
size_t new_height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 0);
size_t row_stride = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);

if ((width[0] != new_width) || (height[0] != new_height)) {
width[0] = new_width;
Expand All @@ -156,7 +157,15 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
}

uint8_t *w = img_data[0].ptrw();
memcpy(w, dataY, new_width * new_height);
if (new_width == row_stride) {
memcpy(w, dataY, new_width * new_height);
} else {
for (size_t i = 0; i < new_height; i++) {
memcpy(w, dataY, new_width);
w += new_width;
dataY += row_stride;
}
}

img[0].instantiate();
img[0]->set_data(new_width, new_height, 0, Image::FORMAT_R8, img_data[0]);
Expand All @@ -166,6 +175,7 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
// do CbCr
size_t new_width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 1);
size_t new_height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 1);
size_t row_stride = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1);

if ((width[1] != new_width) || (height[1] != new_height)) {
width[1] = new_width;
Expand All @@ -174,7 +184,15 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
}

uint8_t *w = img_data[1].ptrw();
memcpy(w, dataCbCr, 2 * new_width * new_height);
if (new_width * 2 == row_stride) {
memcpy(w, dataCbCr, 2 * new_width * new_height);
} else {
for (size_t i = 0; i < new_height; i++) {
memcpy(w, dataCbCr, new_width * 2);
w += new_width * 2;
dataCbCr += row_stride;
}
}

///TODO OpenGL doesn't support FORMAT_RG8, need to do some form of conversion
img[1].instantiate();
Expand All @@ -200,6 +218,7 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
private:
AVCaptureDevice *device;
MyCaptureSession *capture_session;
bool device_locked;

public:
AVCaptureDevice *get_device() const;
Expand All @@ -210,6 +229,9 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM

bool activate_feed() override;
void deactivate_feed() override;

bool set_format(int p_index, const Dictionary &p_parameters) override;
Array get_formats() const override;
};

AVCaptureDevice *CameraFeedMacOS::get_device() const {
Expand All @@ -219,6 +241,7 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
CameraFeedMacOS::CameraFeedMacOS() {
device = nullptr;
capture_session = nullptr;
device_locked = false;
}

void CameraFeedMacOS::set_device(AVCaptureDevice *p_device) {
Expand All @@ -239,6 +262,15 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
if (capture_session) {
// Already recording!
} else {
// Configure device format if specified.
if (selected_format != -1) {
NSError *error;
if (!device_locked) {
device_locked = [device lockForConfiguration:&error];
ERR_FAIL_COND_V_MSG(!device_locked, false, error.localizedFailureReason.UTF8String);
}
[device setActiveFormat:device.formats[selected_format]];
}
// Start camera capture, check permission.
if (@available(macOS 10.14, *)) {
AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
Expand Down Expand Up @@ -267,6 +299,61 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
[capture_session cleanup];
capture_session = nullptr;
};
if (device_locked) {
[device unlockForConfiguration];
device_locked = false;
}
}

bool CameraFeedMacOS::set_format(int p_index, const Dictionary &p_parameters) {
if (p_index == -1) {
selected_format = p_index;
if (is_active()) {
[capture_session beginConfiguration];
}
if (device_locked) {
[device unlockForConfiguration];
device_locked = false;
}
if (is_active()) {
[capture_session commitConfiguration];
}
return true;
}
ERR_FAIL_INDEX_V((unsigned int)p_index, device.formats.count, false);
if (is_active()) {
if (!device_locked) {
NSError *error;
device_locked = [device lockForConfiguration:&error];
ERR_FAIL_COND_V_MSG(!device_locked, false, error.localizedFailureReason.UTF8String);
}
[capture_session beginConfiguration];
[device setActiveFormat:device.formats[p_index]];
}
selected_format = p_index;
if (is_active()) {
[capture_session commitConfiguration];
}
return true;
}

Array CameraFeedMacOS::get_formats() const {
Array result;
for (AVCaptureDeviceFormat *format in device.formats) {
Dictionary dictionary;
CMFormatDescriptionRef formatDescription = format.formatDescription;
CMVideoDimensions dimension = CMVideoFormatDescriptionGetDimensions(formatDescription);
dictionary["width"] = dimension.width;
dictionary["height"] = dimension.height;
FourCharCode fourcc = CMFormatDescriptionGetMediaSubType(formatDescription);
dictionary["format"] =
String::chr((char)(fourcc >> 24) & 0xFF) +
String::chr((char)(fourcc >> 16) & 0xFF) +
String::chr((char)(fourcc >> 8) & 0xFF) +
String::chr((char)(fourcc >> 0) & 0xFF);
result.push_back(dictionary);
}
return result;
}

//////////////////////////////////////////////////////////////////////////
Expand Down
Loading