Skip to content

Commit

Permalink
Merge pull request #105 from webosbrew/backend-cleanup
Browse files Browse the repository at this point in the history 
service: initialize and cleanup backends on start/stop
  • Loading branch information
@TBSniller
TBSniller authored Mar 11, 2023
2 parents ccbc54f + c2ef1a3 commit 10b638f
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 31 deletions.
96 changes: 65 additions & 31 deletions src/service.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ int service_feed_frame(void* data __attribute__((unused)), int width, int height

int service_init(service_t* service, settings_t* settings)
{
cap_backend_config_t config;
config.resolution_width = settings->width;
config.resolution_height = settings->height;
config.fps = settings->fps;
config.quirks = settings->quirks;

service->settings = settings;

unicapture_init(&service->unicapture);
Expand All @@ -84,47 +78,83 @@ int service_init(service_t* service, settings_t* settings)
service->unicapture.callback_data = (void*)service;
service->unicapture.dump_frames = settings->dump_frames;

service_init_backends(service);

return 0;
}

void service_init_backends(service_t* service)
{
settings_t* settings = service->settings;

cap_backend_config_t config;
config.resolution_width = settings->width;
config.resolution_height = settings->height;
config.fps = settings->fps;
config.quirks = settings->quirks;

char* ui_backends[] = { "libgm_backend.so", "libhalgal_backend.so", NULL };
char* video_backends[] = { "libvtcapture_backend.so", "libdile_vt_backend.so", NULL };
char backend_name[FILENAME_MAX] = { 0 };

service->unicapture.ui_capture = NULL;
if (!service->ui_backend_initialized) {
service->unicapture.ui_capture = NULL;

if (settings->no_gui) {
INFO("UI capture disabled");
} else {
if (settings->ui_backend == NULL || strcmp(settings->ui_backend, "") == 0 || strcmp(settings->ui_backend, "auto") == 0) {
INFO("Autodetecting UI backend...");
if (unicapture_try_backends(&config, &service->ui_backend, ui_backends) == 0) {
service->unicapture.ui_capture = &service->ui_backend;
}
if (settings->no_gui) {
INFO("UI capture disabled");
} else {
snprintf(backend_name, sizeof(backend_name), "%s_backend.so", settings->ui_backend);
if (unicapture_init_backend(&config, &service->ui_backend, backend_name) == 0) {
service->unicapture.ui_capture = &service->ui_backend;
if (settings->ui_backend == NULL || strcmp(settings->ui_backend, "") == 0 || strcmp(settings->ui_backend, "auto") == 0) {
INFO("Autodetecting UI backend...");
if (unicapture_try_backends(&config, &service->ui_backend, ui_backends) == 0) {
service->unicapture.ui_capture = &service->ui_backend;
service->ui_backend_initialized = true;
}
} else {
snprintf(backend_name, sizeof(backend_name), "%s_backend.so", settings->ui_backend);
if (unicapture_init_backend(&config, &service->ui_backend, backend_name) == 0) {
service->unicapture.ui_capture = &service->ui_backend;
service->ui_backend_initialized = true;
}
}
}
}

service->unicapture.video_capture = NULL;
if (!service->video_backend_initialized) {
service->unicapture.video_capture = NULL;

if (settings->no_video) {
INFO("Video capture disabled");
} else {
if (settings->video_backend == NULL || strcmp(settings->video_backend, "") == 0 || strcmp(settings->video_backend, "auto") == 0) {
INFO("Autodetecting video backend...");
if (unicapture_try_backends(&config, &service->video_backend, video_backends) == 0) {
service->unicapture.video_capture = &service->video_backend;
}
if (settings->no_video) {
INFO("Video capture disabled");
} else {
snprintf(backend_name, sizeof(backend_name), "%s_backend.so", settings->video_backend);
if (unicapture_init_backend(&config, &service->video_backend, backend_name) == 0) {
service->unicapture.video_capture = &service->video_backend;
if (settings->video_backend == NULL || strcmp(settings->video_backend, "") == 0 || strcmp(settings->video_backend, "auto") == 0) {
INFO("Autodetecting video backend...");
if (unicapture_try_backends(&config, &service->video_backend, video_backends) == 0) {
service->unicapture.video_capture = &service->video_backend;
service->video_backend_initialized = true;
}
} else {
snprintf(backend_name, sizeof(backend_name), "%s_backend.so", settings->video_backend);
if (unicapture_init_backend(&config, &service->video_backend, backend_name) == 0) {
service->unicapture.video_capture = &service->video_backend;
service->video_backend_initialized = true;
}
}
}
}
}

return 0;
void service_destroy_backends(service_t* service)
{
if (service->ui_backend_initialized && service->ui_backend.cleanup) {
DBG("Cleaning up UI backend...");
DBG("Result: %d", service->ui_backend.cleanup(service->ui_backend.state));
service->ui_backend_initialized = false;
}

if (service->video_backend_initialized && service->video_backend.cleanup) {
DBG("Cleaning up video backend...");
DBG("Result: %d", service->video_backend.cleanup(service->video_backend.state));
service->video_backend_initialized = false;
}
}

int service_destroy(service_t* service)
Expand All @@ -139,6 +169,8 @@ int service_start(service_t* service)
return 1;
}

service_init_backends(service);

service->running = true;
int res = unicapture_start(&service->unicapture);

Expand Down Expand Up @@ -168,6 +200,8 @@ int service_stop(service_t* service)
pthread_join(service->connection_thread, NULL);
service->running = false;

service_destroy_backends(service);

return 0;
}

Expand Down
6 changes: 6 additions & 0 deletions src/service.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ typedef struct {
capture_backend_t ui_backend;
capture_backend_t video_backend;

bool ui_backend_initialized;
bool video_backend_initialized;

unicapture_state_t unicapture;

settings_t* settings;
Expand All @@ -28,6 +31,9 @@ typedef struct {
int service_init(service_t* service, settings_t* settings);
int service_register(service_t* service, GMainLoop* loop);

void service_init_backends(service_t* service);
void service_destroy_backends(service_t* service);

int service_start(service_t* service);
int service_stop(service_t* service);

Expand Down

0 comments on commit 10b638f

Please sign in to comment.