mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 04:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor camera driver code

Browse Source
This commit is contained in:
twinaphex 2016-03-04 18:16:07 +01:00
parent 9ba753993b
commit e34943194c
7 changed files with 123 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
camera/camera_driver.c
View File

@ -20,7 +20,6 @@
#include "../general.h"
#include "../string_list_special.h"
#include "../system.h"
#include "../verbosity.h"
static const camera_driver_t *camera_drivers[] = {
@ -89,146 +88,20 @@ const char* config_get_camera_driver_options(void)
return char_list_new_special(STRING_LIST_CAMERA_DRIVERS, NULL);
}
void find_camera_driver(void)
{
int i;
driver_ctx_info_t drv;
settings_t *settings = config_get_ptr();
drv.label = "camera_driver";
drv.s = settings->camera.driver;
driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv);
i = drv.len;
if (i >= 0)
camera_driver = (const camera_driver_t*)camera_driver_find_handle(i);
else
{
unsigned d;
RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
settings->camera.driver);
RARCH_LOG_OUTPUT("Available camera drivers are:\n");
for (d = 0; camera_driver_find_handle(d); d++)
RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));
RARCH_WARN("Going to default to first camera driver...\n");
camera_driver = (const camera_driver_t*)camera_driver_find_handle(0);
if (!camera_driver)
retro_fail(1, "find_camera_driver()");
}
}
/**
* driver_camera_start:
*
* Starts camera driver interface.
* Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
*
* Returns: true (1) if successful, otherwise false (0).
**/
bool driver_camera_start(void)
{
settings_t *settings = config_get_ptr();
if (camera_driver && camera_data && camera_driver->start)
{
if (settings->camera.allow)
return camera_driver->start(camera_data);
runloop_msg_queue_push(
"Camera is explicitly disabled.\n", 1, 180, false);
}
return false;
}
/**
* driver_camera_stop:
*
* Stops camera driver.
* Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
*
* Returns: true (1) if successful, otherwise false (0).
**/
void driver_camera_stop(void)
{
if (camera_driver && camera_driver->stop && camera_data)
camera_driver->stop(camera_data);
camera_driver_ctl(RARCH_CAMERA_CTL_START, NULL);
}
/**
* driver_camera_poll:
*
* Call camera driver's poll function.
* Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
*
* Returns: true (1) if successful, otherwise false (0).
**/
void driver_camera_poll(void)
bool driver_camera_start(void)
{
rarch_system_info_t *system = NULL;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
if (camera_driver && camera_driver->poll && camera_data)
camera_driver->poll(camera_data,
system->camera_callback.frame_raw_framebuffer,
system->camera_callback.frame_opengl_texture);
}
void init_camera(void)
{
settings_t *settings = config_get_ptr();
rarch_system_info_t *system = NULL;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
/* Resource leaks will follow if camera is initialized twice. */
if (camera_data)
return;
find_camera_driver();
camera_data = camera_driver->init(
*settings->camera.device ? settings->camera.device : NULL,
system->camera_callback.caps,
settings->camera.width ?
settings->camera.width : system->camera_callback.width,
settings->camera.height ?
settings->camera.height : system->camera_callback.height);
if (!camera_data)
{
RARCH_ERR("Failed to initialize camera driver. Will continue without camera.\n");
camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_ACTIVE, NULL);
}
if (system->camera_callback.initialized)
system->camera_callback.initialized();
}
static void uninit_camera(void)
{
rarch_system_info_t *system = NULL;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
if (camera_data && camera_driver)
{
if (system->camera_callback.deinitialized)
system->camera_callback.deinitialized();
if (camera_driver->free)
camera_driver->free(camera_data);
}
camera_data = NULL;
return camera_driver_ctl(RARCH_CAMERA_CTL_START, NULL);
}
bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
{
settings_t *settings = config_get_ptr();
static struct retro_camera_callback camera_cb;
static bool camera_driver_active = false;
static bool camera_driver_data_own = false;
@ -250,13 +123,110 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
case RARCH_CAMERA_CTL_SET_ACTIVE:
camera_driver_active = true;
break;
case RARCH_CAMERA_CTL_FIND_DRIVER:
{
int i;
driver_ctx_info_t drv;
drv.label = "camera_driver";
drv.s = settings->camera.driver;
driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv);
i = drv.len;
if (i >= 0)
camera_driver = (const camera_driver_t*)camera_driver_find_handle(i);
else
{
unsigned d;
RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
settings->camera.driver);
RARCH_LOG_OUTPUT("Available camera drivers are:\n");
for (d = 0; camera_driver_find_handle(d); d++)
RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));
RARCH_WARN("Going to default to first camera driver...\n");
camera_driver = (const camera_driver_t*)camera_driver_find_handle(0);
if (!camera_driver)
retro_fail(1, "find_camera_driver()");
}
}
break;
case RARCH_CAMERA_CTL_UNSET_ACTIVE:
camera_driver_active = false;
break;
case RARCH_CAMERA_CTL_IS_ACTIVE:
return camera_driver_active;
case RARCH_CAMERA_CTL_DEINIT:
uninit_camera();
if (camera_data && camera_driver)
{
if (camera_cb.deinitialized)
camera_cb.deinitialized();
if (camera_driver->free)
camera_driver->free(camera_data);
}
camera_data = NULL;
break;
case RARCH_CAMERA_CTL_STOP:
if ( camera_driver
&& camera_driver->stop
&& camera_data)
camera_driver->stop(camera_data);
break;
case RARCH_CAMERA_CTL_START:
if (camera_driver && camera_data && camera_driver->start)
{
if (settings->camera.allow)
return camera_driver->start(camera_data);
runloop_msg_queue_push(
"Camera is explicitly disabled.\n", 1, 180, false);
}
return false;
case RARCH_CAMERA_CTL_POLL:
if (!camera_cb.caps)
return false;
if (!camera_driver || !camera_driver->poll || !camera_data)
return false;
camera_driver->poll(camera_data,
camera_cb.frame_raw_framebuffer,
camera_cb.frame_opengl_texture);
break;
case RARCH_CAMERA_CTL_SET_CB:
{
struct retro_camera_callback *cb =
(struct retro_camera_callback*)data;
camera_cb = *cb;
}
break;
case RARCH_CAMERA_CTL_INIT:
/* Resource leaks will follow if camera is initialized twice. */
if (camera_data)
return false;
camera_driver_ctl(RARCH_CAMERA_CTL_FIND_DRIVER, NULL);
camera_data = camera_driver->init(
*settings->camera.device ? settings->camera.device : NULL,
camera_cb.caps,
settings->camera.width ?
settings->camera.width : camera_cb.width,
settings->camera.height ?
settings->camera.height : camera_cb.height);
if (!camera_data)
{
RARCH_ERR("Failed to initialize camera driver. Will continue without camera.\n");
camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_ACTIVE, NULL);
}
if (camera_cb.initialized)
camera_cb.initialized();
break;
default:
break;

42
camera/camera_driver.h
View File

@ -35,7 +35,13 @@ enum rarch_camera_ctl_state
RARCH_CAMERA_CTL_OWNS_DRIVER,
RARCH_CAMERA_CTL_SET_ACTIVE,
RARCH_CAMERA_CTL_UNSET_ACTIVE,
RARCH_CAMERA_CTL_IS_ACTIVE
RARCH_CAMERA_CTL_IS_ACTIVE,
RARCH_CAMERA_CTL_FIND_DRIVER,
RARCH_CAMERA_CTL_POLL,
RARCH_CAMERA_CTL_SET_CB,
RARCH_CAMERA_CTL_STOP,
RARCH_CAMERA_CTL_START,
RARCH_CAMERA_CTL_INIT
};
typedef struct camera_driver
@ -66,36 +72,6 @@ extern camera_driver_t camera_rwebcam;
extern camera_driver_t camera_avfoundation;
extern camera_driver_t camera_null;
/**
* driver_camera_start:
*
* Starts camera driver.
* Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
*
* Returns: true (1) if successful, otherwise false (0).
**/
bool driver_camera_start(void);
/**
* driver_camera_stop:
*
* Stops camera driver.
* Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
*
* Returns: true (1) if successful, otherwise false (0).
**/
void driver_camera_stop(void);
/**
* driver_camera_poll:
*
* Call camera driver's poll function.
* Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
*
* Returns: true (1) if successful, otherwise false (0).
**/
void driver_camera_poll(void);
/**
* config_get_camera_driver_options:
*
@ -125,9 +101,9 @@ const void *camera_driver_find_handle(int index);
**/
const char *camera_driver_find_ident(int index);
void find_camera_driver(void);
void driver_camera_stop(void);
void init_camera(void);
bool driver_camera_start(void);
bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data);

4
driver.c
View File

@ -351,7 +351,7 @@ static void init_drivers(int flags)
/* Only initialize camera driver if we're ever going to use it. */
if ((flags & DRIVER_CAMERA) && camera_driver_ctl(RARCH_CAMERA_CTL_IS_ACTIVE, NULL))
init_camera();
camera_driver_ctl(RARCH_CAMERA_CTL_INIT, NULL);
/* Only initialize location driver if we're ever going to use it. */
if ((flags & DRIVER_LOCATION) && location_driver_ctl(RARCH_LOCATION_CTL_IS_ACTIVE, NULL))
@ -464,7 +464,7 @@ bool driver_ctl(enum driver_ctl_state state, void *data)
audio_driver_ctl(RARCH_AUDIO_CTL_FIND_DRIVER, NULL);
video_driver_ctl(RARCH_DISPLAY_CTL_FIND_DRIVER, NULL);
input_driver_ctl(RARCH_INPUT_CTL_FIND_DRIVER, NULL);
find_camera_driver();
camera_driver_ctl(RARCH_CAMERA_CTL_FIND_DRIVER, NULL);
find_location_driver();
#ifdef HAVE_MENU
menu_driver_ctl(RARCH_MENU_CTL_FIND_DRIVER, NULL);

9
dynamic.c
View File

@ -1034,16 +1034,17 @@ bool rarch_environment_cb(unsigned cmd, void *data)
iface->get_sensor_input = input_sensor_get_input;
break;
}
case RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE:
{
struct retro_camera_callback *cb =
(struct retro_camera_callback*)data;
RARCH_LOG("Environ GET_CAMERA_INTERFACE.\n");
cb->start = driver_camera_start;
cb->stop = driver_camera_stop;
system->camera_callback = *cb;
cb->start = driver_camera_start;
cb->stop = driver_camera_stop;
camera_driver_ctl(RARCH_CAMERA_CTL_SET_CB, cb);
if (cb->caps != 0)
camera_driver_ctl(RARCH_CAMERA_CTL_SET_ACTIVE, NULL);
else

6
runloop.c
View File

@ -1258,7 +1258,6 @@ int runloop_iterate(unsigned *sleep_ms)
static retro_time_t frame_limit_last_time = 0.0;
static retro_input_t last_input = 0;
settings_t *settings = config_get_ptr();
rarch_system_info_t *system = NULL;
cmd.state[1] = last_input;
cmd.state[0] = input_keys_pressed();
@ -1428,10 +1427,7 @@ int runloop_iterate(unsigned *sleep_ms)
if (bsv_movie_ctl(BSV_MOVIE_CTL_IS_INITED, NULL))
bsv_movie_ctl(BSV_MOVIE_CTL_SET_FRAME_START, NULL);
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
if (system->camera_callback.caps)
driver_camera_poll();
runloop_ctl(RARCH_CAMERA_CTL_POLL, NULL);
/* Update binds for analog dpad modes. */
for (i = 0; i < settings->input.max_users; i++)

3
runloop.h
View File

@ -79,6 +79,9 @@ enum runloop_ctl_state
RUNLOOP_CTL_KEY_EVENT_GET,
RUNLOOP_CTL_DATA_DEINIT,
RUNLOOP_CTL_POLL_CAMERA,
RUNLOOP_CTL_SET_CAMERA_CBS,
/* Checks for state changes in this frame. */
RUNLOOP_CTL_CHECK_STATE,

1
system.h
View File

@ -45,7 +45,6 @@ typedef struct rarch_system_info
char valid_extensions[PATH_MAX_LENGTH];
struct retro_disk_control_callback disk_control;
struct retro_camera_callback camera_callback;
struct retro_location_callback location_callback;
core_option_manager_t *core_options;