From 745631aed0124dab97faceab9b03f460f1f358e8 Mon Sep 17 00:00:00 2001 From: Stephan Wendel Date: Thu, 13 Apr 2023 20:41:27 +0200 Subject: [PATCH] chore: update conf and readme to new params Signed-off-by: Stephan Wendel --- README.md | 8 ++++---- resources/crowsnest.conf | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4d1e47a..96a1122 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,7 @@ By default it look like this: log_level: quiet [cam 1] - mode: mjpg + mode: ustreamer port: 8080 device: /dev/video0 resolution: 640x480 @@ -247,7 +247,7 @@ This forces ustreamer to listen on all available network interfaces. Now the more interessting part. [cam 1] - mode: mjpg + mode: ustreamer enable_rtsp: false rtsp_port: 8554 port: 8080 @@ -262,12 +262,12 @@ _**Note:** You can name the cam, how you want! ex.: [cam raspicam]_ This section should be pretty much self explantory. - mode: mjpg + mode: ustreamer means your choosen streamservice will be ustreamer with the well known mjpg-protocol. \ You can choose: - mode: multi + mode: camera-streamer This let you use the newer stream service 'camera-streamer' diff --git a/resources/crowsnest.conf b/resources/crowsnest.conf index ac72069..4a1f244 100644 --- a/resources/crowsnest.conf +++ b/resources/crowsnest.conf @@ -22,8 +22,6 @@ #### rtsp://:/stream.h264 ##### ##################################################################### -#### NOTE: keyword 'mode:' also allows to set backend name -#### Allowed are ustreamer or camera-streamer (all lowercase letters) [crowsnest] log_path: %LOGPATH% @@ -32,8 +30,9 @@ delete_log: false # Deletes log on every restart, if set t no_proxy: false [cam 1] -mode: mjpg # mjpg/multi - Multi uses webrtc, mjpg and snapshots at the same time -enable_rtsp: false # If multi is used, this enables also usage of an rtsp server +mode: ustreamer # ustreamer - Provides mjpg and snapshots. (All devices) + # camera-streamer - Provides webrtc, mjpg and snapshots. (rpi + Raspi OS based only) +enable_rtsp: false # If camera-streamer is used, this enables also usage of an rtsp server rtsp_port: 8554 # Set different ports for each device! port: 8080 # HTTP/MJPG Stream/Snapshot Port device: /dev/video0 # See Log for available ...