Multicam now works

Author: foosel

.gitignore

@@ -1,2 +1,2 @@
 workspace
-scripts/files/camera-streamer.zip
+scripts/files/camera-streamer/camera-streamer.zip

scripts/03-update-libcamera-apps

@@ -6,4 +6,4 @@ export LC_ALL=C
 source /common.sh
 install_cleanup_trap
 
-apt-get install --yes --only-upgrade libcamera-apps-lite
+apt-get install --yes libcamera-apps-lite

scripts/10-install-camera-streamer

@@ -6,8 +6,10 @@ export LC_ALL=C
 source /common.sh
 install_cleanup_trap
 
+# install dependencies
 apt-get install --yes libavformat-dev libavutil-dev libavcodec-dev libcamera-dev liblivemedia-dev v4l-utils pkg-config xxd build-essential cmake libssl-dev
 
+# install camera-streamer
 cp /files/camera-streamer/camera-streamer.zip /tmp/camera-streamer.zip
 unzip /tmp/camera-streamer.zip -d /tmp/camera-streamer
 rm /tmp/camera-streamer.zip
@@ -18,25 +20,35 @@ pushd /tmp/camera-streamer/camera-streamer
 popd
 rm -rf /tmp/camera-streamer
 
+# enable camera auto-detection
 sed -i 's/^camera_auto_detect=0/camera_auto_detect=1/' /boot/config.txt
 
-cp /files/camera-streamer/camera-streamer.conf /boot/camera-streamer.conf
+# install default configs
+mkdir -p /boot/camera-streamer
+cp /files/camera-streamer/libcamera.conf /boot/camera-streamer/libcamera.conf
+cp /files/camera-streamer/usb.conf /boot/camera-streamer/usb.conf
 
+# install libcamera service
 cp /files/camera-streamer/camera-streamer-libcamera.service /etc/systemd/system/camera-streamer-libcamera.service
 systemctl enable camera-streamer-libcamera.service
 
-cp /files/camera-streamer/camera-streamer-usb.service /etc/systemd/system/camera-streamer-usb.service
-systemctl enable camera-streamer-usb.service
+# install USB camera service
+cp /files/camera-streamer/camera-streamer-control /root/bin/camera-streamer-control
+chmod +x /root/bin/camera-streamer-control
 
-cp /files/camera-streamer/camera-streamer-usb.path /etc/systemd/system/camera-streamer-usb.path
-systemctl enable camera-streamer-usb.path
+cp /files/camera-streamer/camera-streamer-usb@.service /etc/systemd/system/camera-streamer-usb@.service
+cp /files/camera-streamer/camera-streamer-usb@.path /etc/systemd/system/camera-streamer-usb@.path
+cp /files/camera-streamer/camera-streamer.service /etc/systemd/system/camera-streamer.service
 
-# prepare multicam template folder
-cp /files/camera-streamer/camera-streamer-usb-multi@.service /etc/systemd/system/camera-streamer-usb-multi@.service
-systemctl enable camera-streamer-usb.service
+systemctl enable camera-streamer.service
 
-mkdir -p /boot/camera-streamer.conf.d
-cp /files/camera-streamer/multi-example.conf /boot/camera-streamer.conf.d/example.conf
+# install helper scripts
+cp /files/camera-streamer/add-usb-camera /root/bin/add-usb-camera
+cp /files/camera-streamer/remove-usb-camera /root/bin/remove-usb-camera
+cp /files/camera-streamer/list-usb-cameras /root/bin/list-usb-cameras
+chmod +x /root/bin/add-usb-camera
+chmod +x /root/bin/remove-usb-camera
+chmod +x /root/bin/list-usb-cameras
 
 # clean up the old crap
 systemctl disable webcamd

scripts/files/camera-streamer/add-usb-camera

@@ -0,0 +1,95 @@
+#!/bin/bash
+
+if [ "$EUID" -ne 0 ]
+  then echo "Please run as root/with sudo"
+  exit 1
+fi
+
+NAME=$1
+PORT=$2
+DEVICE=$3
+
+## Name
+
+if [ -z "$NAME" ]; then
+  echo "Usage: $0 <name> <port> <device>"
+  exit 1
+fi
+
+# make sure the name is unique
+if [ -e "/boot/camera-streamer/$NAME.conf" ]; then
+  echo "Camera $NAME already exists"
+  exit 1
+fi
+
+## Port
+
+if [ -z "$PORT" ]; then
+  port=8080
+  while grep -qs "PORT=$port" /boot/camera-streamer/*.conf; do
+    port=$((port+1))
+  done
+  PORT=$port
+  echo "No port provided, automatically selected port $PORT"
+  echo
+fi
+
+# make sure the port is available
+if grep -qs "PORT=$PORT" /boot/camera-streamer/*.conf; then
+  echo "Port $PORT is already used by another camera"
+  exit 1
+fi
+
+## Device
+
+if [ -z "$DEVICE" ]; then
+  echo "Please make sure your USB camera is plugged in and select it below:"
+  echo
+  PS3="? "
+  options=($(echo /dev/v4l/by-id/usb-*-video-index0)) # list all the USB v4l2 devices
+  select opt in "${options[@]}"; do
+    if [ -n "$opt" ]; then
+      DEVICE=$opt
+      break
+    fi
+    echo
+  done
+  echo
+fi
+
+# make sure the device exists
+if [ ! -e "$DEVICE" ]; then
+  echo "Device $DEVICE does not exist"
+  exit 1
+fi
+
+sudo cat > /boot/camera-streamer/$NAME.conf <<EOF
+### Options for USB based cameras
+
+# The port on which the webcam server for the camera should listen on.
+PORT=$PORT
+
+# The path to the camera device.
+DEVICE=$DEVICE
+
+# The image format of the camera.
+FORMAT=YUYV
+
+# The resolution to set on the camera. Defaults to 1280x720.
+WIDTH=1280
+HEIGHT=720
+
+# The framerate to set on the camera. Defaults to 15fps.
+FRAMERATE=15
+
+# Additional options. Leave at log-debug=0 if not needed.
+OPTIONS='-log-debug=0'
+EOF
+
+sudo systemctl start camera-streamer-usb@$NAME.path
+
+echo "Camera $NAME added"
+echo
+echo "Port:               $PORT"
+echo "Device:             $DEVICE"
+echo "Configuration file: /boot/camera-streamer/$NAME.conf"

scripts/files/camera-streamer/camera-streamer-control

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+action=$1
+
+systemctl $action "camera-streamer-libcamera.service"
+
+# iterate over all the camera confs in /boot/camera-streamer
+for conf in /boot/camera-streamer/*.conf; do
+  # skip the libcamera.conf
+  if [ "$conf" = "/boot/camera-streamer/libcamera.conf" ]; then
+    continue
+  fi
+
+  # get the name of the camera
+  name=$(basename "$conf" .conf)
+
+  # enable the camera
+  systemctl $action "camera-streamer-usb@$name.path"
+  systemctl $action "camera-streamer-usb@$name.service"
+done

scripts/files/camera-streamer/camera-streamer-libcamera.service

@@ -1,20 +1,21 @@
 [Unit]
 Description=camera-streamer libcamera
 After=network.target
-ConditionPathExistsGlob=/sys/bus/i2c/drivers/*/*/video4linux
+StartLimitIntervalSec=120
+StartLimitBurst=10
 
 [Service]
-EnvironmentFile=/boot/camera-streamer.conf
-ExecStart=/usr/local/bin/camera-streamer \
+EnvironmentFile=/boot/camera-streamer/libcamera.conf
+ExecCondition=/bin/sh -c "/usr/bin/libcamera-hello --list-cameras | grep -o '/base/soc/[^)]*'"
+ExecStart=/bin/sh -c "/usr/local/bin/camera-streamer \
+  -http-port=${PORT} \
   -camera-type=libcamera \
-  ; YUYV offers best quality in camera-streamer
+  -camera-path=$(/usr/bin/libcamera-hello --list-cameras | grep -o '/base/soc/[^)]*') \
   -camera-format=YUYV \
-  -camera-width=${LIBCAMERA_WIDTH} -camera-height=${LIBCAMERA_HEIGHT} \
-  -camera-fps=${LIBCAMERA_FRAMERATE} \
+  -camera-width=${WIDTH} -camera-height=${HEIGHT} \
+  -camera-fps=${FRAMERATE} \
   -camera-nbufs=2 \
-  -camera-high_res_factor=1 \
-  -camera-low_res_factor=2 \
-  ${LIBCAMERA_OPTIONS}
+  ${OPTIONS}"
 
 DynamicUser=yes
 SupplementaryGroups=video i2c

scripts/files/camera-streamer/camera-streamer-usb-multi@.service

@@ -1,9 +1,9 @@
 [Unit]
-Description=camera-streamer usb autolaunch
+Description=camera-streamer %i autolaunch
+After=network.target
 
 [Path]
 PathExistsGlob=/dev/v4l/by-id/usb-*-video-index0
-Unit=camera-streamer-usb.service
 
 [Install]
 WantedBy=multi-user.target

scripts/files/camera-streamer/camera-streamer-usb.service

@@ -0,0 +1,34 @@
+[Unit]
+Description=camera-streamer %i
+After=network.target
+After=camera-streamer-libcamera.service
+ConditionPathExistsGlob=/dev/v4l/by-id/usb-*-video-index0
+StartLimitIntervalSec=120
+StartLimitBurst=10
+
+[Service]
+EnvironmentFile=/boot/camera-streamer/%i.conf
+ExecCondition=/bin/sh -c "[ -e $DEVICE ]"
+ExecStart=/bin/sh -c "/usr/local/bin/camera-streamer \
+  -http-port=${PORT} \
+  -camera-path="${DEVICE}" \
+  -camera-type=v4l2 \
+  -camera-format=${FORMAT} \
+  -camera-width=${WIDTH} -camera-height=${HEIGHT} \
+  -camera-fps=${FRAMERATE} \
+  -camera-nbufs=2 \
+  ${OPTIONS}"
+
+DynamicUser=yes
+SupplementaryGroups=video i2c
+Restart=always
+RestartSec=10
+Nice=10
+IOSchedulingClass=idle
+IOSchedulingPriority=7
+CPUWeight=20
+AllowedCPUs=1-2
+MemoryMax=250M
+
+[Install]
+WantedBy=multi-user.target