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

Add -snapshot.height, -stream.height and -video.height

Browse Source
This commit is contained in:
Kamil Trzciński
2022-10-29 14:30:43 +02:00
committed by Kamil Trzcinski
parent c18561c9f8
commit ca08adb62f
29 changed files with 553 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/camera-streamer/main.c
View File

@ -16,6 +16,36 @@ extern rtsp_options_t rtsp_options;
camera_t *camera;
void deprecations()
{
if (camera_options.high_res_factor > 0) {
printf("Using deprecated `-camera-high_res_factor`. Use `-camera-snapshot.height` instead.");
if (!camera_options.snapshot.height)
camera_options.snapshot.height = camera_options.height / camera_options.high_res_factor;
}
if (camera_options.low_res_factor > 0) {
printf("Using deprecated `-camera-low_res_factor`. Use `-camera-stream.height` or `-camera-video.height` instead.");
if (!camera_options.stream.height)
camera_options.stream.height = camera_options.height / camera_options.low_res_factor;
if (!camera_options.video.height)
camera_options.video.height = camera_options.height / camera_options.low_res_factor;
}
}
void inherit()
{
if (!camera_options.snapshot.height || camera_options.snapshot.height > camera_options.height)
camera_options.snapshot.height = camera_options.height;
if (!camera_options.video.height || camera_options.video.height > camera_options.snapshot.height)
camera_options.video.height = camera_options.snapshot.height;
if (!camera_options.stream.height || camera_options.stream.height > camera_options.video.height)
camera_options.stream.height = camera_options.video.height;
}
int main(int argc, char *argv[])
{
int http_fd = -1;
@ -25,6 +55,9 @@ int main(int argc, char *argv[])
return -1;
}
deprecations();
inherit();
if (camera_options.list_options) {
camera = camera_open(&camera_options);
if (camera) {

30
cmd/camera-streamer/opts.c
View File

@ -4,6 +4,7 @@
#include "util/opts/fourcc.h"
#include "device/camera/camera.h"
#include "output/rtsp/rtsp.h"
#include "output/output.h"
camera_options_t camera_options = {
.path = "",
@ -13,13 +14,19 @@ camera_options_t camera_options = {
.nbufs = 3,
.fps = 30,
.allow_dma = true,
.high_res_factor = 1.0,
.high_res_factor = 0.0,
.low_res_factor = 0.0,
.auto_reconnect = 0,
.auto_focus = true,
.options = "",
.list_options = false,
.h264 = {
.snapshot = {
.options = "compression_quality=80"
},
.stream = {
.options = "compression_quality=80"
},
.video = {
.options =
"video_bitrate_mode=0" OPTION_VALUE_LIST_SEP
"video_bitrate=2000000" OPTION_VALUE_LIST_SEP
@ -29,10 +36,7 @@ camera_options_t camera_options = {
"h264_profile=4" OPTION_VALUE_LIST_SEP
"h264_minimum_qp_value=16" OPTION_VALUE_LIST_SEP
"h264_maximum_qp_value=32"
},
.jpeg = {
.options = "compression_quality=80"
},
}
};
http_server_options_t http_options = {
@ -93,8 +97,18 @@ option_t all_options[] = {
DEFINE_OPTION_DEFAULT(camera, hflip, bool, "1", "Do horizontal image flip (does not work with all camera)."),
DEFINE_OPTION_PTR(camera, isp.options, list, "Set the ISP processing options. List all available options with `-camera-list_options`."),
DEFINE_OPTION_PTR(camera, jpeg.options, list, "Set the JPEG compression options. List all available options with `-camera-list_options`."),
DEFINE_OPTION_PTR(camera, h264.options, list, "Set the H264 encoding options. List all available options with `-camera-list_options`."),
DEFINE_OPTION_PTR(camera, snapshot.options, list, "Set the JPEG compression options. List all available options with `-camera-list_options`."),
DEFINE_OPTION(camera, snapshot.height, uint, "Override the snapshot height and maintain aspect ratio."),
DEFINE_OPTION_DEFAULT(camera, stream.disabled, bool, "1", "Disable stream."),
DEFINE_OPTION_PTR(camera, stream.options, list, "Set the JPEG compression options. List all available options with `-camera-list_options`."),
DEFINE_OPTION(camera, stream.height, uint, "Override the stream height and maintain aspect ratio."),
DEFINE_OPTION_DEFAULT(camera, video.disabled, bool, "1", "Disable video."),
DEFINE_OPTION_PTR(camera, video.options, list, "Set the H264 encoding options. List all available options with `-camera-list_options`."),
DEFINE_OPTION(camera, video.height, uint, "Override the video height and maintain aspect ratio."),
DEFINE_OPTION_DEFAULT(camera, list_options, bool, "1", "List all available options and exit."),
DEFINE_OPTION(http, port, uint, "Set the HTTP web-server port."),