izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(macos): prevent indefinite hanging if screen capture is not granted (#3360)

Browse Source
This commit is contained in:
Cathy J. Fitzpatrick
2024-11-02 10:05:56 -07:00
committed by GitHub
parent c54664bbe0
commit a06d4aefa6
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform/macos/display.mm
View File

@@ -5,6 +5,7 @@
#include "src/platform/common.h"
#include "src/platform/macos/av_img_t.h"
#include "src/platform/macos/av_video.h"
#include "src/platform/macos/misc.h"
#include "src/platform/macos/nv12_zero_device.h"
#include "src/config.h"
@@ -100,6 +101,13 @@ namespace platf {
int
dummy_img(img_t *img) override {
if (!platf::is_screen_capture_allowed()) {
// If we don't have the screen capture permission, this function will hang
// indefinitely without doing anything useful. Exit instead to avoid this.
// A non-zero return value indicates failure to the calling function.
return 1;
}
auto signal = [av_capture capture:^(CMSampleBufferRef sampleBuffer) {
auto new_sample_buffer = std::make_shared<av_sample_buf_t>(sampleBuffer);
auto new_pixel_buffer = std::make_shared<av_pixel_buf_t>(new_sample_buffer->buf);