CreatBot/CreatBotCrowsnest
CreatBot/CreatBotCrowsnest
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Automated] Merged develop into target master

Browse Source
This commit is contained in:
Stefan Dej 2024-02-17 20:20:45 +01:00 committed by GitHub
commit 99cfba58ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/camera-streamer.sh
View File

@ -25,7 +25,7 @@ function run_multi() {
} }
function run_ayucamstream() { function run_ayucamstream() {
local cam_sec ust_bin dev pt res rtsp rtsp_pt fps cstm start_param local cam_sec ust_bin dev pt res rtsp rtsp_pt fps cstm noprx start_param
local v4l2ctl local v4l2ctl
cam_sec="${1}" cam_sec="${1}"
ust_bin="${BASE_CN_PATH}/bin/camera-streamer/camera-streamer" ust_bin="${BASE_CN_PATH}/bin/camera-streamer/camera-streamer"
@ -36,11 +36,21 @@ function run_ayucamstream() {
rtsp=$(get_param "cam ${cam_sec}" enable_rtsp) rtsp=$(get_param "cam ${cam_sec}" enable_rtsp)
rtsp_pt=$(get_param "cam ${cam_sec}" rtsp_port) rtsp_pt=$(get_param "cam ${cam_sec}" rtsp_port)
cstm="$(get_param "cam ${cam_sec}" custom_flags 2> /dev/null)" cstm="$(get_param "cam ${cam_sec}" custom_flags 2> /dev/null)"
noprx="$(get_param "crowsnest" no_proxy 2> /dev/null)"
## construct start parameter ## construct start parameter
# set http port # set http port
# #
start_param=( --http-port="${pt}" ) start_param=( --http-port="${pt}" )
if [[ -n "${noprx}" ]] && [[ "${noprx}" = "true" ]]; then
# See https://github.com/mainsail-crew/crowsnest/pull/221#issuecomment-1863555700 for why
# we cannot assume the binary has support for `--http-listen`.
if ${ust_bin} --help | grep -q "http-listen"; then
start_param+=( --http-listen=0.0.0.0 )
log_msg "INFO: Set to 'no_proxy' mode! Using 0.0.0.0!"
fi
fi
# Set device # Set device
start_param+=( --camera-path="${dev}" ) start_param+=( --camera-path="${dev}" )