Skip to content

Commit

Permalink
fix(macos): prevent indefinite hanging if screen capture is not grant…
Browse files Browse the repository at this point in the history
…ed (#3360)
  • Loading branch information
cathyjf authored Nov 2, 2024
1 parent c54664b commit a06d4ae
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/platform/macos/display.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -100,6 +101,13 @@

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);
Expand Down
5 changes: 5 additions & 0 deletions src/platform/macos/misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

#include <CoreGraphics/CoreGraphics.h>

namespace platf {
bool
is_screen_capture_allowed();
}

namespace dyn {
typedef void (*apiproc)();

Expand Down
12 changes: 12 additions & 0 deletions src/platform/macos/misc.mm
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@
CGRequestScreenCaptureAccess(void) __attribute__((weak_import));
#endif

namespace {
auto screen_capture_allowed = std::atomic<bool> { false };
} // namespace

// Return whether screen capture is allowed for this process.
bool
is_screen_capture_allowed() {
return screen_capture_allowed;
}

std::unique_ptr<deinit_t>
init() {
// This will generate a warning about CGPreflightScreenCaptureAccess and
Expand All @@ -68,6 +78,8 @@
return nullptr;
}
#pragma clang diagnostic pop
// Record that we determined that we have the screen capture permission.
screen_capture_allowed = true;
return std::make_unique<deinit_t>();
}

Expand Down

0 comments on commit a06d4ae

Please sign in to comment.