ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Silence warnings/style nits

This commit is contained in:
libretroadmin 2025-05-29 06:19:04 +02:00
parent bd04f9154b
commit 1ff8346eb5
2 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
camera/drivers/avfoundation.m
View File

@ -537,59 +537,66 @@ static void generateColorBars(uint32_t *buffer, size_t width, size_t height) {
static void *avfoundation_init(const char *device, uint64_t caps, static void *avfoundation_init(const char *device, uint64_t caps,
unsigned width, unsigned height) unsigned width, unsigned height)
{ {
RARCH_LOG("[Camera]: Initializing AVFoundation camera %ux%u\n", width, height);
avfoundation_t *avf = (avfoundation_t*)calloc(1, sizeof(avfoundation_t)); avfoundation_t *avf = (avfoundation_t*)calloc(1, sizeof(avfoundation_t));
if (!avf) { RARCH_LOG("[Camera]: Initializing AVFoundation camera %ux%u\n", width, height);
if (!avf)
{
RARCH_ERR("[Camera]: Failed to allocate avfoundation_t\n"); RARCH_ERR("[Camera]: Failed to allocate avfoundation_t\n");
return NULL; return NULL;
} }
avf->manager = [AVCameraManager sharedInstance]; avf->manager = [AVCameraManager sharedInstance];
avf->width = width; avf->width = width;
avf->height = height; avf->height = height;
avf->manager.width = width; avf->manager.width = width;
avf->manager.height = height; avf->manager.height = height;
// Check if we're on the main thread /* Check if we're on the main thread */
if ([NSThread isMainThread]) { if ([NSThread isMainThread])
{
RARCH_LOG("[Camera]: Initializing on main thread\n"); RARCH_LOG("[Camera]: Initializing on main thread\n");
// Direct initialization on main thread /* Direct initialization on main thread */
[AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) { [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]; AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
if (status != AVAuthorizationStatusAuthorized) { if (status != AVAuthorizationStatusAuthorized)
{
RARCH_ERR("[Camera]: Camera access not authorized (status: %d)\n", (int)status); RARCH_ERR("[Camera]: Camera access not authorized (status: %d)\n", (int)status);
free(avf); free(avf);
return; return;
} }
}]; }];
} else { }
else
{
RARCH_LOG("[Camera]: Initializing on background thread\n"); RARCH_LOG("[Camera]: Initializing on background thread\n");
// Use dispatch_sync to run authorization check on main thread /* Use dispatch_sync to run authorization check on main thread */
__block AVAuthorizationStatus status; __block AVAuthorizationStatus status;
dispatch_sync(dispatch_get_main_queue(), ^{ dispatch_sync(dispatch_get_main_queue(), ^{
status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]; status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
}); });
if (status != AVAuthorizationStatusAuthorized) { if (status != AVAuthorizationStatusAuthorized)
{
RARCH_ERR("[Camera]: Camera access not authorized (status: %d)\n", (int)status); RARCH_ERR("[Camera]: Camera access not authorized (status: %d)\n", (int)status);
free(avf); free(avf);
return NULL; return NULL;
} }
} }
// Allocate frame buffer /* Allocate frame buffer */
avf->manager.frameBuffer = (uint32_t*)calloc(width * height, sizeof(uint32_t)); avf->manager.frameBuffer = (uint32_t*)calloc(width * height, sizeof(uint32_t));
if (!avf->manager.frameBuffer) { if (!avf->manager.frameBuffer)
{
RARCH_ERR("[Camera]: Failed to allocate frame buffer\n"); RARCH_ERR("[Camera]: Failed to allocate frame buffer\n");
free(avf); free(avf);
return NULL; return NULL;
} }
// Initialize capture session on main thread /* Initialize capture session on main thread */
__block bool setupSuccess = false; __block bool setupSuccess = false;
if ([NSThread isMainThread]) { if ([NSThread isMainThread])
{
@autoreleasepool { @autoreleasepool {
setupSuccess = [avf->manager setupCameraSession]; setupSuccess = [avf->manager setupCameraSession];
if (setupSuccess) { if (setupSuccess) {
@ -597,7 +604,9 @@ static void *avfoundation_init(const char *device, uint64_t caps,
RARCH_LOG("[Camera]: Started camera session\n"); RARCH_LOG("[Camera]: Started camera session\n");
} }
} }
} else { }
else
{
dispatch_sync(dispatch_get_main_queue(), ^{ dispatch_sync(dispatch_get_main_queue(), ^{
@autoreleasepool { @autoreleasepool {
setupSuccess = [avf->manager setupCameraSession]; setupSuccess = [avf->manager setupCameraSession];
@ -609,15 +618,17 @@ static void *avfoundation_init(const char *device, uint64_t caps,
}); });
} }
if (!setupSuccess) { if (!setupSuccess)
{
RARCH_ERR("[Camera]: Failed to setup camera\n"); RARCH_ERR("[Camera]: Failed to setup camera\n");
free(avf->manager.frameBuffer); free(avf->manager.frameBuffer);
free(avf); free(avf);
return NULL; return NULL;
} }
// Add a check to verify the session is actually running /* Add a check to verify the session is actually running */
if (!avf->manager.session.isRunning) { if (!avf->manager.session.isRunning)
{
RARCH_ERR("[Camera]: Failed to start camera session\n"); RARCH_ERR("[Camera]: Failed to start camera session\n");
free(avf->manager.frameBuffer); free(avf->manager.frameBuffer);
free(avf); free(avf);
@ -636,11 +647,11 @@ static void avfoundation_free(void *data)
RARCH_LOG("[Camera]: Freeing AVFoundation camera\n"); RARCH_LOG("[Camera]: Freeing AVFoundation camera\n");
if (avf->manager.session) { if (avf->manager.session)
[avf->manager.session stopRunning]; [avf->manager.session stopRunning];
}
if (avf->manager.frameBuffer) { if (avf->manager.frameBuffer)
{
free(avf->manager.frameBuffer); free(avf->manager.frameBuffer);
avf->manager.frameBuffer = NULL; avf->manager.frameBuffer = NULL;
} }
@ -651,8 +662,10 @@ static void avfoundation_free(void *data)
static bool avfoundation_start(void *data) static bool avfoundation_start(void *data)
{ {
bool isRunning;
avfoundation_t *avf = (avfoundation_t*)data; avfoundation_t *avf = (avfoundation_t*)data;
if (!avf || !avf->manager.session) { if (!avf || !avf->manager.session)
{
RARCH_ERR("[Camera]: Cannot start - invalid data\n"); RARCH_ERR("[Camera]: Cannot start - invalid data\n");
return false; return false;
} }
@ -664,10 +677,10 @@ static bool avfoundation_start(void *data)
RARCH_LOG("[Camera]: Camera session started on background thread\n"); RARCH_LOG("[Camera]: Camera session started on background thread\n");
}); });
// Give the session a moment to start /* Give the session a moment to start */
usleep(100000); // 100ms usleep(100000); /* 100ms */
bool isRunning = avf->manager.session.isRunning; isRunning = avf->manager.session.isRunning;
RARCH_LOG("[Camera]: Camera session running: %s\n", isRunning ? "YES" : "NO"); RARCH_LOG("[Camera]: Camera session running: %s\n", isRunning ? "YES" : "NO");
return isRunning; return isRunning;
} }
@ -691,15 +704,18 @@ static bool avfoundation_poll(void *data,
retro_camera_frame_opengl_texture_t frame_gl_cb) retro_camera_frame_opengl_texture_t frame_gl_cb)
{ {
avfoundation_t *avf = (avfoundation_t*)data; avfoundation_t *avf = (avfoundation_t*)data;
if (!avf || !frame_raw_cb) { if (!avf || !frame_raw_cb)
{
RARCH_ERR("[Camera]: Cannot poll - invalid data or callback\n"); RARCH_ERR("[Camera]: Cannot poll - invalid data or callback\n");
return false; return false;
} }
if (!avf->manager.session.isRunning) { if (!avf->manager.session.isRunning)
{
RARCH_LOG("[Camera]: Camera not running, generating color bars\n"); RARCH_LOG("[Camera]: Camera not running, generating color bars\n");
uint32_t *tempBuffer = (uint32_t*)calloc(avf->width * avf->height, sizeof(uint32_t)); uint32_t *tempBuffer = (uint32_t*)calloc(avf->width * avf->height, sizeof(uint32_t));
if (tempBuffer) { if (tempBuffer)
{
generateColorBars(tempBuffer, avf->width, avf->height); generateColorBars(tempBuffer, avf->width, avf->height);
frame_raw_cb(tempBuffer, avf->width, avf->height, avf->width * 4); frame_raw_cb(tempBuffer, avf->width, avf->height, avf->width * 4);
free(tempBuffer); free(tempBuffer);
@ -722,4 +738,4 @@ camera_driver_t camera_avfoundation = {
avfoundation_stop, avfoundation_stop,
avfoundation_poll, avfoundation_poll,
"avfoundation" "avfoundation"
}; };

2
menu/cbs/menu_cbs_ok.c
View File

@ -7795,7 +7795,7 @@ static int action_ok_unload_core(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
struct menu_state *menu_st = menu_state_get_ptr(); struct menu_state *menu_st = menu_state_get_ptr();
int ret = generic_action_ok_command(CMD_EVENT_UNLOAD_CORE); generic_action_ok_command(CMD_EVENT_UNLOAD_CORE);
path_clear(RARCH_PATH_CORE_LAST); path_clear(RARCH_PATH_CORE_LAST);
menu_st->flags |= MENU_ST_FLAG_ENTRIES_NEED_REFRESH menu_st->flags |= MENU_ST_FLAG_ENTRIES_NEED_REFRESH
| MENU_ST_FLAG_PREVENT_POPULATE; | MENU_ST_FLAG_PREVENT_POPULATE;