McSinyx
/
megapixels
mirror of https://git.sr.ht/~martijnbraam/megapixels
1
1
Fork 0
Code Issues Releases Wiki Activity

Fixed FMT config function

This commit is contained in:
Martijn Braam 2020-01-24 02:32:02 +01:00
parent 9fc697315b
commit 6190add3bc
No known key found for this signature in database
GPG Key ID: C4280ACB000B060F
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.c
View File

@ -219,7 +219,7 @@ init_device(int fd)
.type = V4L2_BUF_TYPE_VIDEO_CAPTURE, .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
}; };
if (preview_width > 0) { if (preview_width > 0) {
g_printerr("Setting camera to %dx%d fmt %d", g_printerr("Setting camera to %dx%d fmt %d\n",
preview_width, preview_height, preview_fmt); preview_width, preview_height, preview_fmt);
fmt.fmt.pix.width = preview_width; fmt.fmt.pix.width = preview_width;
fmt.fmt.pix.height = preview_height; fmt.fmt.pix.height = preview_height;
@ -230,19 +230,19 @@ init_device(int fd)
errno_exit("VIDIOC_S_FMT"); errno_exit("VIDIOC_S_FMT");
} }
g_printerr("Driver returned %dx%d fmt %d", g_printerr("Driver returned %dx%d fmt %d\n",
fmt.fmt.pix.width, fmt.fmt.pix.height, fmt.fmt.pix.width, fmt.fmt.pix.height,
fmt.fmt.pix.pixelformat); fmt.fmt.pix.pixelformat);
/* Note VIDIOC_S_FMT may change width and height. */ /* Note VIDIOC_S_FMT may change width and height. */
} else { } else {
g_printerr("Querying camera format"); g_printerr("Querying camera format\n");
/* Preserve original settings as set by v4l2-ctl for example */ /* Preserve original settings as set by v4l2-ctl for example */
if (xioctl(fd, VIDIOC_G_FMT, &fmt) == -1) { if (xioctl(fd, VIDIOC_G_FMT, &fmt) == -1) {
errno_exit("VIDIOC_G_FMT"); errno_exit("VIDIOC_G_FMT");
} }
g_printerr("Driver returned %dx%d fmt %d", g_printerr("Driver returned %dx%d fmt %d\n",
fmt.fmt.pix.width, fmt.fmt.pix.height, fmt.fmt.pix.width, fmt.fmt.pix.height,
fmt.fmt.pix.pixelformat); fmt.fmt.pix.pixelformat);
@ -423,7 +423,6 @@ config_ini_handler(void *user, const char *section, const char *name,
g_printerr("Unsupported pixelformat %s\n", value); g_printerr("Unsupported pixelformat %s\n", value);
exit(1); exit(1);
} }
preview_fmt = strtol(value, NULL, 10);
} else { } else {
g_printerr("Unknown key '%s' in [preview]\n", name); g_printerr("Unknown key '%s' in [preview]\n", name);
exit(1); exit(1);