From 53e8e3fdb625d4ffe2f3b7cbf1ba689948573a6c Mon Sep 17 00:00:00 2001 From: 2114L3 <2114L3@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:04:25 +1000 Subject: [PATCH 1/6] Update camera-streamer-arducam-64MP.service deprecated argument syntax --- service/camera-streamer-arducam-64MP.service | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/service/camera-streamer-arducam-64MP.service b/service/camera-streamer-arducam-64MP.service index af9924a..51a3f01 100644 --- a/service/camera-streamer-arducam-64MP.service +++ b/service/camera-streamer-arducam-64MP.service @@ -8,26 +8,26 @@ ConditionPathExists=/sys/bus/i2c/drivers/arducam_64mp/10-001a/video4linux ExecStartPre=-/usr/bin/v4l2-ctl -d /dev/v4l-subdev1 -c focus_absolute=2200 ExecStart=/usr/local/bin/camera-streamer \ - -camera-path=/base/soc/i2c0mux/i2c@1/arducam_64mp@1a \ - -camera-type=libcamera \ - -camera-format=YUYV \ - -camera-width=2328 -camera-height=1748 \ - -camera-fps=30 \ + --camera-path=/base/soc/i2c0mux/i2c@1/arducam_64mp@1a \ + --camera-type=libcamera \ + --camera-format=YUYV \ + --camera-width=2328 --camera-height=1748 \ + --camera-fps=30 \ ; use two memory buffers to optimise usage - -camera-nbufs=2 \ + --camera-nbufs=2 \ ; the snapshot is 1438x1080 - -camera-snapshot.height=1080 \ + --camera-snapshot.height=1080 \ ; the video/webrtc is 958x720 - -camera-video.height=720 \ + --camera-video.height=720 \ ; the stream is 639x480 - -camera-stream.height=480 \ + --camera-stream.height=480 \ ; bump brightness slightly - -camera-options=brightness=0.1 \ + --camera-options=brightness=0.1 \ ; disable auto-focus - -camera-auto_focus=0 \ + --camera-auto_focus=0 \ --http-listen=0.0.0.0 \ --http-port=8080 \ - -rtsp-port + --rtsp-port DynamicUser=yes SupplementaryGroups=video i2c From 441c8e3aa576bb6175bd58d31f53c9852954013c Mon Sep 17 00:00:00 2001 From: 2114L3 <2114L3@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:09:22 +1000 Subject: [PATCH 2/6] Update camera-streamer-arducam-16MP.service deprecated argument syntax --- service/camera-streamer-arducam-16MP.service | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/service/camera-streamer-arducam-16MP.service b/service/camera-streamer-arducam-16MP.service index dffecb9..91d2d3c 100644 --- a/service/camera-streamer-arducam-16MP.service +++ b/service/camera-streamer-arducam-16MP.service @@ -5,27 +5,27 @@ ConditionPathExists=/sys/bus/i2c/drivers/imx519/10-001a/video4linux [Service] ExecStart=/usr/local/bin/camera-streamer \ - -camera-path=/base/soc/i2c0mux/i2c@1/imx519@1a \ - -camera-type=libcamera \ - -camera-format=YUYV \ - -camera-width=2328 -camera-height=1748 \ - -camera-options=rotation=90 \ - -camera-fps=15 \ + --camera-path=/base/soc/i2c0mux/i2c@1/imx519@1a \ + --camera-type=libcamera \ + --camera-format=YUYV \ + --camera-width=2328 --camera-height=1748 \ + --camera-options=rotation=90 \ + --camera-fps=15 \ ; use two memory buffers to optimise usage - -camera-nbufs=2 \ + --camera-nbufs=2 \ ; the snapshot is 1438x1080 - -camera-snapshot.height=1080 \ + --camera-snapshot.height=1080 \ ; the video/webrtc is 958x720 - -camera-video.height=720 \ + --camera-video.height=720 \ ; the stream is 639x480 - -camera-stream.height=480 \ + --camera-stream.height=480 \ ; bump brightness slightly - -camera-options=brightness=0.1 \ + --camera-options=brightness=0.1 \ ; disable auto-focus - -camera-auto_focus=1 \ + --camera-auto_focus=1 \ --http-listen=0.0.0.0 \ --http-port=8080 \ - -rtsp-port + --rtsp-port DynamicUser=yes SupplementaryGroups=video i2c From a346c3c21cd9af674a6395411205446492cf32f4 Mon Sep 17 00:00:00 2001 From: 2114L3 <2114L3@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:09:52 +1000 Subject: [PATCH 3/6] Update camera-streamer-generic-usb-cam.service deprecated argument syntax --- service/camera-streamer-generic-usb-cam.service | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/service/camera-streamer-generic-usb-cam.service b/service/camera-streamer-generic-usb-cam.service index b9287e5..c01a471 100644 --- a/service/camera-streamer-generic-usb-cam.service +++ b/service/camera-streamer-generic-usb-cam.service @@ -5,17 +5,17 @@ ConditionPathExistsGlob=/dev/v4l/by-id/usb-*-video-index0 [Service] ExecStart=/usr/local/bin/camera-streamer \ - -camera-path=/dev/video0 \ - -camera-format=JPEG \ - -camera-width=1920 -camera-height=1080 \ - -camera-fps=30 \ + --camera-path=/dev/video0 \ + --camera-format=JPEG \ + --camera-width=1920 --camera-height=1080 \ + --camera-fps=30 \ ; use two memory buffers to optimise usage - -camera-nbufs=3 \ + --camera-nbufs=3 \ --http-listen=0.0.0.0 \ --http-port=8080 \ ; disable video streaming (WebRTC, RTSP, H264) ; on non-supported platforms - -camera-video.disabled + --camera-video.disabled DynamicUser=yes SupplementaryGroups=video i2c From ff54eea0572cb8c196cb27ec9d7927a063a26bd0 Mon Sep 17 00:00:00 2001 From: 2114L3 <2114L3@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:10:18 +1000 Subject: [PATCH 4/6] Update camera-streamer-raspi-usb-cam.service deprecated argument syntax --- service/camera-streamer-raspi-usb-cam.service | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/service/camera-streamer-raspi-usb-cam.service b/service/camera-streamer-raspi-usb-cam.service index 15f59d2..4b7a7c8 100644 --- a/service/camera-streamer-raspi-usb-cam.service +++ b/service/camera-streamer-raspi-usb-cam.service @@ -5,21 +5,21 @@ ConditionPathExistsGlob=/dev/v4l/by-id/usb-*-video-index0 [Service] ExecStart=/usr/local/bin/camera-streamer \ - -camera-path=/dev/video0 \ - -camera-format=JPEG \ - -camera-width=1920 -camera-height=1080 \ - -camera-fps=30 \ + --camera-path=/dev/video0 \ + --camera-format=JPEG \ + --camera-width=1920 --camera-height=1080 \ + --camera-fps=30 \ ; use two memory buffers to optimise usage - -camera-nbufs=3 \ + --camera-nbufs=3 \ ; the high-res is 1920x1080 - -camera-snapshot.height=1080 \ + --camera-snapshot.height=1080 \ ; the video/webrtc is 1280x720 - -camera-video.height=720 \ + --camera-video.height=720 \ ; the stream is 853x480 - -camera-stream.height=480 \ + --camera-stream.height=480 \ --http-listen=0.0.0.0 \ --http-port=8080 \ - -rtsp-port + --rtsp-port DynamicUser=yes SupplementaryGroups=video i2c From 983d6bfac4dd987da2e4db4e518eaec20c6ff0ec Mon Sep 17 00:00:00 2001 From: 2114L3 <2114L3@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:10:42 +1000 Subject: [PATCH 5/6] Update camera-streamer-raspi-v2-8MP.service deprecated argument syntax --- service/camera-streamer-raspi-v2-8MP.service | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/service/camera-streamer-raspi-v2-8MP.service b/service/camera-streamer-raspi-v2-8MP.service index 58d7624..1fdfc70 100644 --- a/service/camera-streamer-raspi-v2-8MP.service +++ b/service/camera-streamer-raspi-v2-8MP.service @@ -9,24 +9,24 @@ ConditionPathExists=/sys/bus/i2c/drivers/imx219/10-0010/video4linux [Service] ExecStart=/usr/local/bin/camera-streamer \ - -camera-path=/base/soc/i2c0mux/i2c@1/imx219@10 \ - -camera-type=libcamera \ - -camera-format=YUYV \ - -camera-width=3280 -camera-height=2464 \ - -camera-fps=30 \ + --camera-path=/base/soc/i2c0mux/i2c@1/imx219@10 \ + --camera-type=libcamera \ + --camera-format=YUYV \ + --camera-width=3280 --camera-height=2464 \ + --camera-fps=30 \ ; use two memory buffers to optimise usage - -camera-nbufs=2 \ + --camera-nbufs=2 \ ; the snapshot is 1438x1080 - -camera-snapshot.height=1080 \ + --camera-snapshot.height=1080 \ ; the video/webrtc is 958x720 - -camera-video.height=720 \ + --camera-video.height=720 \ ; the stream is 639x480 - -camera-stream.height=480 \ + --camera-stream.height=480 \ ; bump brightness slightly - -camera-options=brightness=0.1 \ + --camera-options=brightness=0.1 \ --http-listen=0.0.0.0 \ --http-port=8080 \ - -rtsp-port + --rtsp-port DynamicUser=yes SupplementaryGroups=video i2c From 736fbbd7089e81c670ce8d9ea4fd4e971dd06c2e Mon Sep 17 00:00:00 2001 From: 2114L3 <2114L3@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:11:11 +1000 Subject: [PATCH 6/6] Update camera-streamer-raspi-v3-12MP.service deprecated argument syntax --- service/camera-streamer-raspi-v3-12MP.service | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/service/camera-streamer-raspi-v3-12MP.service b/service/camera-streamer-raspi-v3-12MP.service index f68c758..1cbf3df 100644 --- a/service/camera-streamer-raspi-v3-12MP.service +++ b/service/camera-streamer-raspi-v3-12MP.service @@ -9,25 +9,25 @@ ConditionPathExists=/sys/bus/i2c/drivers/imx708/10-001a/video4linux [Service] ExecStart=/usr/local/bin/camera-streamer \ - -camera-path=/base/soc/i2c0mux/i2c@1/imx708@1a \ - -camera-type=libcamera \ - -camera-format=YUYV \ - -camera-width=2304 -camera-height=1296 \ - -camera-fps=30 \ + --camera-path=/base/soc/i2c0mux/i2c@1/imx708@1a \ + --camera-type=libcamera \ + --camera-format=YUYV \ + --camera-width=2304 --camera-height=1296 \ + --camera-fps=30 \ ; use two memory buffers to optimise usage - -camera-nbufs=2 \ + --camera-nbufs=2 \ ; the snapshot is 1920x1080 - -camera-snapshot.height=1080 \ + --camera-snapshot.height=1080 \ ; the video/webrtc is 1280x720 - -camera-video.height=720 \ + --camera-video.height=720 \ ; the stream is 853x480 - -camera-stream.height=480 \ + --camera-stream.height=480 \ ; enable continuous autofocus - -camera-options=AfMode=2 \ - -camera-options=AfRange=2 \ + --camera-options=AfMode=2 \ + --camera-options=AfRange=2 \ --http-listen=0.0.0.0 \ --http-port=8080 \ - -rtsp-port + --rtsp-port DynamicUser=yes SupplementaryGroups=video i2c