diff --git a/config.yml.home b/config.yml.home index f5ecfbd..5bf3d97 100644 --- a/config.yml.home +++ b/config.yml.home @@ -59,9 +59,13 @@ cameras: - path: rtsp://127.0.0.1:8554/ipc_1_sub roles: - detect + live: + streams: + Main: ipc_1 + Sub: ipc_1_sub motion: mask: 0.781,0.037,0.779,0.094,1,0.094,1,0.034 - threshold: 40 + threshold: 50 contour_area: 20 improve_contrast: true objects: @@ -72,7 +76,7 @@ semantic_search: enabled: false model_size: small face_recognition: - enabled: true + enabled: false model_size: small lpr: enabled: false diff --git a/config.yml.prime b/config.yml.prime index 05d5fc9..c575134 100755 --- a/config.yml.prime +++ b/config.yml.prime @@ -18,8 +18,13 @@ mqtt: enabled: false birdseye: enabled: false +<<<<<<< HEAD auth: enabled: false +======= +#auth: +# enabled: false +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 go2rtc: streams: 1-1: rtsp://admin:Password~2022@192.168.170.36:554/Streaming/Channels/101 @@ -202,9 +207,15 @@ go2rtc: 5-5: rtsp://admin:Password~2022@192.168.170.86:554/Streaming/Channels/101 5-5_sub: rtsp://admin:Password~2022@192.168.170.86:554/Streaming/Channels/102 +<<<<<<< HEAD 5-6: rtsp://admin:Password~2022@192.168.170.79:554/Streaming/Channels/101 5-6_sub: rtsp://admin:Password~2022@192.168.170.79:554/Streaming/Channels/102 +======= +# 5-6: rtsp://admin:Password~2022@192.168.170.79:554/Streaming/Channels/101 +# 5-6_sub: +# rtsp://admin:Password~2022@192.168.170.79:554/Streaming/Channels/102 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 5-7: rtsp://admin:Password~2022@192.168.170.91:554/Streaming/Channels/101 5-7_sub: rtsp://admin:Password~2022@192.168.170.91:554/Streaming/Channels/102 @@ -235,8 +246,13 @@ go2rtc: 5-16: rtsp://admin:Password~2022@192.168.170.103:554/Streaming/Channels/101 5-16_sub: rtsp://admin:Password~2022@192.168.170.103:554/Streaming/Channels/102 +<<<<<<< HEAD domofon: rtsp://admin:Password~2022@192.168.170.171/h264/stream.live0 domofon_sub: rtsp://admin:Password~2022@192.168.170.171/h264/stream.live1 +======= +# domofon: rtsp://admin:Password~2022@192.168.170.171/h264/stream.live0 +# domofon_sub: rtsp://admin:Password~2022@192.168.170.171/h264/stream.live1 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 # webrtc: # candidates: # - 192.168.170.3:8555 @@ -249,6 +265,10 @@ ffmpeg: output_args: record: preset-record-generic-audio-aac record: +<<<<<<< HEAD +======= + sync_recordings: True +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 enabled: true retain: days: 14 @@ -281,7 +301,11 @@ cameras: roles: - detect motion: +<<<<<<< HEAD mask: 0.22,0.098,0.291,0.097,0.291,0.059,0.22,0.061 +======= + mask: 0.169,0.07,0.24,0.069,0.24,0.031,0.169,0.033 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 1-3: ffmpeg: inputs: @@ -292,7 +316,11 @@ cameras: roles: - detect motion: +<<<<<<< HEAD mask: 0.22,0.098,0.291,0.097,0.291,0.059,0.22,0.061 +======= + mask: 0.192,0.066,0.263,0.065,0.263,0.027,0.192,0.029 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 1-4: ffmpeg: inputs: @@ -358,7 +386,11 @@ cameras: roles: - detect motion: +<<<<<<< HEAD mask: 0.002,0.128,1,0.126,1,0,0,0 +======= + mask: 0,0.119,0.292,0.119,0.291,0,0,0 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 1-10: ffmpeg: inputs: @@ -401,6 +433,11 @@ cameras: - path: rtsp://127.0.0.1:8554/1-13_sub roles: - detect +<<<<<<< HEAD +======= + motion: + mask: 0,0.104,0.308,0.103,0.307,0.034,0,0.045 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 1-14: ffmpeg: inputs: @@ -422,7 +459,11 @@ cameras: roles: - detect motion: +<<<<<<< HEAD mask: 0.22,0.098,0.291,0.097,0.291,0.059,0.22,0.061 +======= + mask: 0.171,0.066,0.242,0.065,0.242,0.027,0.171,0.029 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 1-16: ffmpeg: inputs: @@ -488,7 +529,11 @@ cameras: roles: - detect motion: +<<<<<<< HEAD mask: 0.22,0.098,0.291,0.097,0.291,0.059,0.22,0.061 +======= + mask: 0,0.108,0.246,0.083,0.245,0,0,0 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 2-4: ffmpeg: inputs: @@ -499,7 +544,11 @@ cameras: roles: - detect motion: +<<<<<<< HEAD mask: 0.22,0.098,0.291,0.097,0.291,0.059,0.22,0.061 +======= + mask: 0.172,0.066,0.243,0.065,0.243,0.027,0.172,0.029 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 2-5: ffmpeg: inputs: @@ -531,6 +580,11 @@ cameras: - path: rtsp://127.0.0.1:8554/2-7_sub roles: - detect +<<<<<<< HEAD +======= + motion: + mask: 0,0.133,0.303,0.144,0.3,0,0,0 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 2-8: ffmpeg: inputs: @@ -743,7 +797,14 @@ cameras: roles: - detect motion: +<<<<<<< HEAD mask: 0.22,0.098,0.291,0.097,0.291,0.059,0.22,0.061 +======= + mask: 0.166,0.067,0.237,0.066,0.237,0.028,0.166,0.03 + threshold: 40 + contour_area: 10 + improve_contrast: true +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 4-2: ffmpeg: inputs: @@ -920,6 +981,7 @@ cameras: - detect motion: mask: 0.22,0.098,0.291,0.097,0.291,0.059,0.22,0.061 +<<<<<<< HEAD 5-6: ffmpeg: inputs: @@ -931,6 +993,19 @@ cameras: - detect motion: mask: 0.22,0.098,0.291,0.097,0.291,0.059,0.22,0.061 +======= + # 5-6: + # ffmpeg: + # inputs: + # - path: rtsp://127.0.0.1:8554/5-6 + # roles: + # - record + # - path: rtsp://127.0.0.1:8554/5-6_sub + # roles: + # - detect + # motion: + # mask: 0.22,0.098,0.291,0.097,0.291,0.059,0.22,0.061 +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 5-7: ffmpeg: inputs: @@ -1041,6 +1116,7 @@ cameras: - detect motion: mask: 0.22,0.098,0.291,0.097,0.291,0.059,0.22,0.061 +<<<<<<< HEAD domofon: ffmpeg: inputs: @@ -1050,6 +1126,17 @@ cameras: - path: rtsp://127.0.0.1:8554/domofon_sub roles: - detect +======= + # domofon: + # ffmpeg: + # inputs: + # - path: rtsp://127.0.0.1:8554/domofon + # roles: + # - record + # - path: rtsp://127.0.0.1:8554/domofon_sub + # roles: + # - detect +>>>>>>> 8885cdca382b08bd2559587de2271a01e9bb5391 camera_groups: Perimetr: diff --git a/restart.sh b/restart.sh new file mode 100755 index 0000000..e8e1310 --- /dev/null +++ b/restart.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# Navigate to the directory containing your docker-compose.yml file +# Replace /path/to/your/project with the actual path +#cd /path/to/your/project + +echo "Bringing down Docker Compose services..." +docker compose down + +echo "Bringing up Docker Compose services..." +docker compose up -d + +echo "Docker Compose services restarted."