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

decoder: improve support for rescaller to prefer NV12

Browse Source
This commit is contained in:
Kamil Trzcinski 2023-02-23 15:27:42 +01:00
parent cdecb592b9
commit 53bfdcfedf
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
device/camera/camera_decoder.c
View File

@ -18,12 +18,12 @@ static unsigned decoder_formats[] =
V4L2_PIX_FMT_YUYV, V4L2_PIX_FMT_YUYV,
// medium quality // medium quality
V4L2_PIX_FMT_YUV420,
V4L2_PIX_FMT_NV12, V4L2_PIX_FMT_NV12,
V4L2_PIX_FMT_YUV420,
// low quality // low quality
V4L2_PIX_FMT_YVU420,
V4L2_PIX_FMT_NV21, V4L2_PIX_FMT_NV21,
V4L2_PIX_FMT_YVU420,
0 0
}; };

13
device/camera/camera_rescaller.c
View File

@ -11,26 +11,27 @@
#include "util/http/http.h" #include "util/http/http.h"
#define MAX_RESCALLER_SIZE 1920 #define MAX_RESCALLER_SIZE 1920
#define RESCALLER_BLOCK_SIZE 32
static unsigned camera_rescaller_align_size(unsigned size) static unsigned camera_rescaller_align_size(unsigned size, unsigned align_size)
{ {
return (size + 31) / 32 * 32; return (size + align_size - 1) / align_size * align_size;
} }
static void camera_get_scaled_resolution2(unsigned in_width, unsigned in_height, unsigned proposed_height, unsigned *target_width, unsigned *target_height) static void camera_get_scaled_resolution2(unsigned in_width, unsigned in_height, unsigned proposed_height, unsigned *target_width, unsigned *target_height)
{ {
proposed_height = MIN(proposed_height, in_height); proposed_height = MIN(proposed_height, in_height);
*target_height = camera_rescaller_align_size(proposed_height); *target_height = camera_rescaller_align_size(proposed_height, RESCALLER_BLOCK_SIZE);
*target_height = MIN(*target_height, MAX_RESCALLER_SIZE); *target_height = MIN(*target_height, MAX_RESCALLER_SIZE);
// maintain aspect ratio on target width // maintain aspect ratio on target width
*target_width = camera_rescaller_align_size(*target_height * in_width / in_height); *target_width = camera_rescaller_align_size(*target_height * in_width / in_height, RESCALLER_BLOCK_SIZE);
// if width is larger then rescaller, try to maintain scale down height // if width is larger then rescaller, try to maintain scale down height
if (*target_width > MAX_RESCALLER_SIZE) { if (*target_width > MAX_RESCALLER_SIZE) {
*target_width = MAX_RESCALLER_SIZE; *target_width = MAX_RESCALLER_SIZE;
*target_height = camera_rescaller_align_size(*target_width * in_height / in_width); *target_height = camera_rescaller_align_size(*target_width * in_height / in_width, RESCALLER_BLOCK_SIZE);
} }
} }
@ -100,7 +101,7 @@ buffer_list_t *camera_configure_rescaller(camera_t *camera, buffer_list_t *src_c
return NULL; return NULL;
} }
buffer_list_t *rescaller_capture = NULL; // camera_try_rescaller(camera, src_capture, name, target_height, src_capture->fmt.format); buffer_list_t *rescaller_capture = camera_try_rescaller(camera, src_capture, name, target_height, src_capture->fmt.format);
for (int i = 0; !rescaller_capture && formats[i]; i++) { for (int i = 0; !rescaller_capture && formats[i]; i++) {
rescaller_capture = camera_try_rescaller(camera, src_capture, name, target_height, formats[i]); rescaller_capture = camera_try_rescaller(camera, src_capture, name, target_height, formats[i]);

5
device/v4l2/buffer_list.c
View File

@ -61,11 +61,6 @@ int v4l2_buffer_list_open(buffer_list_t *buf_list)
buffer_format_t fmt = buf_list->fmt; buffer_format_t fmt = buf_list->fmt;
unsigned block_width = 1, block_height = 1; unsigned block_width = 1, block_height = 1;
if (buf_list->do_capture && strstr(buf_list->name, "RESCALLER")) {
block_width = 32;
block_height = 32;
}
LOG_DEBUG(buf_list, "Get current format ..."); LOG_DEBUG(buf_list, "Get current format ...");
ERR_IOCTL(buf_list, buf_list->v4l2->dev_fd, VIDIOC_G_FMT, &v4l2_fmt, "Can't get format"); ERR_IOCTL(buf_list, buf_list->v4l2->dev_fd, VIDIOC_G_FMT, &v4l2_fmt, "Can't get format");