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

WIP

Browse Source
This commit is contained in:
Kamil Trzcinski
2022-04-04 19:48:08 +02:00
parent 0322dc920a
commit 932c32576b
7 changed files with 160 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
links.c
View File

@ -72,8 +72,8 @@ int links_step(link_t *all_links, int timeout)
buffer_list_enqueue(link->outputs[j]->output_list, buf);
}
if (link->on_buffer) {
link->on_buffer(buf);
if (link->callbacks.on_buffer) {
link->callbacks.on_buffer(buf);
}
buffer_consumed(buf);
@ -89,73 +89,25 @@ int links_step(link_t *all_links, int timeout)
int links_stream(link_t *all_links, bool do_stream)
{
for (int i = 0; all_links[i].capture; i++) {
if (device_stream(all_links[i].capture, true) < 0) {
E_LOG_ERROR(all_links[i].capture, "Failed to start streaming");
}
int n;
for (int j = 0; all_links[i].outputs[j]; j++) {
if (device_stream(all_links[i].outputs[j], true) < 0) {
E_LOG_ERROR(all_links[i].outputs[j], "Failed to start streaming");
}
}
}
for (n = 0; all_links[n].capture; n++);
return 0;
error:
return -1;
}
int links_open_buffer_list_from(device_t *dev, bool do_capture, buffer_list_t *parent_buffer, unsigned format)
{
if (!parent_buffer) {
return -1;
}
return device_open_buffer_list(
dev,
do_capture,
parent_buffer->fmt_width,
parent_buffer->fmt_height,
format ? format : parent_buffer->fmt_format,
parent_buffer->nbufs
);
}
int links_init(link_t *all_links)
{
// create all outputs (sinks)
for (int i = 0; all_links[i].capture; i++) {
for (int i = n; --i >= 0; ) {
bool streaming = true;
link_t *link = &all_links[i];
if (!link->capture) {
E_LOG_ERROR(NULL, "Missing link capture.");
if (link->callbacks.check_streaming) {
streaming = link->callbacks.check_streaming();
}
if (link->capture_format) {
int ret = links_open_buffer_list_from(
link->capture,
true,
link->capture->upstream_device ? link->capture->upstream_device->output_list : link->capture->output_list,
link->capture_format
);
if (ret < 0) {
E_LOG_ERROR(link->capture, "Failed to create capture_list.");
}
}
if (!link->capture->capture_list) {
E_LOG_ERROR(link->capture, "Missing capture device.");
if (buffer_list_stream(link->capture->capture_list, streaming) < 0) {
E_LOG_ERROR(link->capture, "Failed to start streaming");
}
for (int j = 0; link->outputs[j]; j++) {
device_t *output = link->outputs[j];
int ret = links_open_buffer_list_from(output, false, link->capture->capture_list, 0);
if (ret < 0) {
E_LOG_ERROR(output, "Failed to create output_list.");
if (buffer_list_stream(link->outputs[j]->output_list, streaming) < 0) {
E_LOG_ERROR(link->outputs[j], "Failed to start streaming");
}
}
}
@ -166,15 +118,74 @@ error:
return -1;
}
// int links_open_buffer_list_from(device_t *dev, bool do_capture, buffer_list_t *parent_buffer, unsigned format)
// {
// if (!parent_buffer) {
// return -1;
// }
// return device_open_buffer_list(
// dev,
// do_capture,
// parent_buffer->fmt_width,
// parent_buffer->fmt_height,
// format ? format : parent_buffer->fmt_format,
// parent_buffer->nbufs
// );
// }
// int links_init(link_t *all_links)
// {
// // create all outputs (sinks)
// for (int i = 0; all_links[i].capture; i++) {
// link_t *link = &all_links[i];
// if (!link->capture) {
// E_LOG_ERROR(NULL, "Missing link capture.");
// }
// if (link->capture_format) {
// int ret = links_open_buffer_list_from(
// link->capture,
// true,
// link->capture->upstream_device ? link->capture->upstream_device->output_list : link->capture->output_list,
// link->capture_format
// );
// if (ret < 0) {
// E_LOG_ERROR(link->capture, "Failed to create capture_list.");
// }
// }
// if (!link->capture->capture_list) {
// E_LOG_ERROR(link->capture, "Missing capture device.");
// }
// for (int j = 0; link->outputs[j]; j++) {
// device_t *output = link->outputs[j];
// int ret = links_open_buffer_list_from(output, false, link->capture->capture_list, 0);
// if (ret < 0) {
// E_LOG_ERROR(output, "Failed to create output_list.");
// }
// }
// }
// return 0;
// error:
// return -1;
// }
int links_loop(link_t *all_links, bool *running)
{
if (links_stream(all_links, true) < 0) {
return -1;
}
*running = true;
while(*running) {
if (links_stream(all_links, true) < 0) {
return -1;
}
if (links_step(all_links, 1000) < 0) {
links_stream(all_links, false);
return -1;