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

camera: find device handling the format by format order

Browse Source
This commit is contained in:
Kamil Trzcinski 2023-02-21 15:33:56 +01:00
parent 0c244a61c8
commit 168181afa5
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
device/camera/camera_output.c
View File

@ -12,21 +12,20 @@
#include "output/rtsp/rtsp.h" #include "output/rtsp/rtsp.h"
#include "output/output.h" #include "output/output.h"
static bool camera_output_matches_capture(buffer_list_t *capture, unsigned target_height, unsigned formats[]) static bool camera_output_matches_capture(buffer_list_t *capture, unsigned target_height, unsigned format)
{ {
if (target_height && capture->fmt.height != target_height && capture->fmt.height != camera_rescaller_align_size(target_height)) { if (target_height && capture->fmt.height != target_height && capture->fmt.height != camera_rescaller_align_size(target_height)) {
return false; return false;
} }
for (int i = 0; formats[i]; i++) { if (format != capture->fmt.format) {
if (formats[i] == capture->fmt.format) return false;
return true;
} }
return false; return true;
} }
static buffer_list_t *camera_find_capture(camera_t *camera, unsigned target_height, unsigned formats[]) static buffer_list_t *camera_find_capture(camera_t *camera, unsigned target_height, unsigned format)
{ {
for (int i = 0; i < MAX_DEVICES; i++) { for (int i = 0; i < MAX_DEVICES; i++) {
if (!camera->devices[i]) if (!camera->devices[i])
@ -36,7 +35,7 @@ static buffer_list_t *camera_find_capture(camera_t *camera, unsigned target_heig
for (int j = 0; j < device->n_capture_list; j++) { for (int j = 0; j < device->n_capture_list; j++) {
buffer_list_t *capture_list = device->capture_lists[j]; buffer_list_t *capture_list = device->capture_lists[j];
if (camera_output_matches_capture(capture_list, target_height, formats)) { if (camera_output_matches_capture(capture_list, target_height, format)) {
return capture_list; return capture_list;
} }
} }
@ -45,6 +44,18 @@ static buffer_list_t *camera_find_capture(camera_t *camera, unsigned target_heig
return NULL; return NULL;
} }
static buffer_list_t *camera_find_capture2(camera_t *camera, unsigned target_height, unsigned formats[])
{
for (int i = 0; formats[i]; i++) {
buffer_list_t *capture = camera_find_capture(camera, target_height, formats[i]);
if (capture) {
return capture;
}
}
return NULL;
}
static unsigned rescalled_formats[] = static unsigned rescalled_formats[] =
{ {
// best quality // best quality
@ -63,16 +74,16 @@ static unsigned rescalled_formats[] =
int camera_configure_output(camera_t *camera, const char *name, unsigned target_height, unsigned formats[], link_callbacks_t callbacks, device_t **device) int camera_configure_output(camera_t *camera, const char *name, unsigned target_height, unsigned formats[], link_callbacks_t callbacks, device_t **device)
{ {
buffer_list_t *src_capture = camera_find_capture(camera, target_height, formats); buffer_list_t *src_capture = camera_find_capture2(camera, target_height, formats);
if (src_capture) { if (src_capture) {
camera_capture_add_callbacks(camera, src_capture, callbacks); camera_capture_add_callbacks(camera, src_capture, callbacks);
return 0; return 0;
} }
src_capture = camera_find_capture(camera, target_height, rescalled_formats); src_capture = camera_find_capture2(camera, target_height, rescalled_formats);
if (!src_capture) { if (!src_capture) {
// Try to find re-scallabe output // Try to find re-scallabe output
src_capture = camera_find_capture(camera, 0, rescalled_formats); src_capture = camera_find_capture2(camera, 0, rescalled_formats);
if (src_capture) { if (src_capture) {
src_capture = camera_configure_rescaller(camera, src_capture, name, target_height, rescalled_formats); src_capture = camera_configure_rescaller(camera, src_capture, name, target_height, rescalled_formats);
} }

2
device/camera/camera_pipeline.c
View File

@ -13,8 +13,8 @@
static unsigned snapshot_formats[] = static unsigned snapshot_formats[] =
{ {
V4L2_PIX_FMT_MJPEG,
V4L2_PIX_FMT_JPEG, V4L2_PIX_FMT_JPEG,
V4L2_PIX_FMT_MJPEG,
0 0
}; };