jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatically reconnect

Browse Source
This commit is contained in:
Kamil Trzcinski 2022-04-12 09:23:46 +02:00
parent a1c974c9be
commit ddca582551
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/camera-streamer.c
View File

@ -38,6 +38,7 @@ camera_options_t camera_options = {
.allow_dma = true, .allow_dma = true,
.high_res_factor = 1.0, .high_res_factor = 1.0,
.low_res_factor = 0.0, .low_res_factor = 0.0,
.auto_reconnect = 0,
.h264 = { .h264 = {
.options = .options =
"video_bitrate_mode=0" OPTION_VALUE_LIST_SEP "video_bitrate_mode=0" OPTION_VALUE_LIST_SEP
@ -98,6 +99,7 @@ option_t all_options[] = {
DEFINE_OPTION(camera, high_res_factor, float), DEFINE_OPTION(camera, high_res_factor, float),
DEFINE_OPTION(camera, low_res_factor, float), DEFINE_OPTION(camera, low_res_factor, float),
DEFINE_OPTION_PTR(camera, options, list), DEFINE_OPTION_PTR(camera, options, list),
DEFINE_OPTION(camera, auto_reconnect, uint),
DEFINE_OPTION_PTR(camera, isp.options, list), DEFINE_OPTION_PTR(camera, isp.options, list),
DEFINE_OPTION_PTR(camera, jpeg.options, list), DEFINE_OPTION_PTR(camera, jpeg.options, list),
@ -118,26 +120,32 @@ int main(int argc, char *argv[])
int http_fd = -1; int http_fd = -1;
int ret = -1; int ret = -1;
const char *env; const char *env;
camera_t *camera;
if (parse_opts(all_options, argc, argv) < 0) { if (parse_opts(all_options, argc, argv) < 0) {
return -1; return -1;
} }
camera = camera_open(&camera_options);
if (!camera) {
goto error;
}
http_fd = http_server(&http_options, http_methods); http_fd = http_server(&http_options, http_methods);
if (http_fd < 0) { if (http_fd < 0) {
goto error; goto error;
} }
ret = camera_run(camera); while (true) {
camera_t *camera = camera_open(&camera_options);
if (camera) {
ret = camera_run(camera);
camera_close(camera);
}
if (camera_options.auto_reconnect > 0) {
LOG_INFO(NULL, "Automatically reconnecting in %d seconds...", camera_options.auto_reconnect);
sleep(camera_options.auto_reconnect);
} else {
break;
}
}
error: error:
close(http_fd); close(http_fd);
camera_close(camera);
return ret; return ret;
} }

1
device/camera/camera.h
View File

@ -22,6 +22,7 @@ typedef struct camera_options_s {
bool allow_dma; bool allow_dma;
float high_res_factor; float high_res_factor;
float low_res_factor; float low_res_factor;
int auto_reconnect;
char options[CAMERA_OPTIONS_LENGTH]; char options[CAMERA_OPTIONS_LENGTH];