From 9a0bcf6cdce79c8baf937c723c9a49c9c8ab2217 Mon Sep 17 00:00:00 2001 From: Ashish D'Souza Date: Sun, 23 Jul 2023 16:41:00 -0400 Subject: [PATCH] Added doorbell camera --- Jenkinsfile | 2 +- conf/config.yaml | 15 +++++++++++++++ conf/docker-compose.yaml | 2 ++ install.yaml | 4 ++++ start.yaml | 1 + 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f00af55..c64cdc6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { frigate_config = readJSON file: 'frigate_config.json' } - ansiblePlaybook credentialsId: 'rivendell-ssh-key', disableHostKeyChecking: true, extras: "--extra-vars 'mqtt_password=\"${frigate_config.mqtt.password}\" ipgeolocation_api_key=\"${frigate_config.ipgeolocation.api_key}\" garage_rtsp_password=\"${frigate_config.rtsp.garage.password}\" front_door_rtsp_password=\"${frigate_config.rtsp.front_door.password}\" driveway_rtsp_password=\"${frigate_config.rtsp.driveway.password}\" back_door_rtsp_password=\"${frigate_config.rtsp.back_door.password}\" family_room_rtsp_password=\"${frigate_config.rtsp.family_room.password}\"'", playbook: 'install.yaml' + ansiblePlaybook credentialsId: 'rivendell-ssh-key', disableHostKeyChecking: true, extras: "--extra-vars 'mqtt_password=\"${frigate_config.mqtt.password}\" ipgeolocation_api_key=\"${frigate_config.ipgeolocation.api_key}\" garage_rtsp_password=\"${frigate_config.rtsp.garage.password}\" front_door_rtsp_password=\"${frigate_config.rtsp.front_door.password}\" doorbell_rtsp_password=\"${frigate_config.rtsp.doorbell.password}\" driveway_rtsp_password=\"${frigate_config.rtsp.driveway.password}\" back_door_rtsp_password=\"${frigate_config.rtsp.back_door.password}\" family_room_rtsp_password=\"${frigate_config.rtsp.family_room.password}\"'", playbook: 'install.yaml' ansiblePlaybook credentialsId: 'rivendell-ssh-key', disableHostKeyChecking: true, playbook: 'stop.yaml' ansiblePlaybook credentialsId: 'rivendell-ssh-key', disableHostKeyChecking: true, playbook: 'start.yaml' } diff --git a/conf/config.yaml b/conf/config.yaml index 53bb3f7..59676fc 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -50,6 +50,21 @@ cameras: - 167,1080,511,1080,328,744,234,456,140,451,0,509,0,804 # Flower bed and hedge - 359,85,542,0,0,0,0,288 # Sidewalk - 1153,847,1112,838,1042,896,1023,988,1023,1080,1525,1080 # Drainpipe + doorbell: + enabled: true + ffmpeg: + inputs: + - path: 'rtsp://{FRIGATE_DOORBELL_RTSP_USERNAME}:{FRIGATE_DOORBELL_RTSP_PASSWORD}@192.168.0.105:554/cam/realmonitor?channel=1&subtype=0' + roles: + - detect + - record + hwaccel_args: preset-intel-qsv-h264 # Use Intel QSV hardware acceleration for H.264 + output_args: + record: preset-record-generic-audio-aac # Record with aac audio + detect: + enabled: true + width: 1920 + height: 1080 driveway: enabled: true ffmpeg: diff --git a/conf/docker-compose.yaml b/conf/docker-compose.yaml index d3bc64c..d61f612 100644 --- a/conf/docker-compose.yaml +++ b/conf/docker-compose.yaml @@ -20,6 +20,8 @@ services: FRIGATE_GARAGE_RTSP_PASSWORD: ${FRIGATE_GARAGE_RTSP_PASSWORD} FRIGATE_FRONT_DOOR_RTSP_USERNAME: motion FRIGATE_FRONT_DOOR_RTSP_PASSWORD: ${FRIGATE_FRONT_DOOR_RTSP_PASSWORD} + FRIGATE_DOORBELL_RTSP_USERNAME: admin + FRIGATE_DOORBELL_RTSP_PASSWORD: ${FRIGATE_DOORBELL_RTSP_PASSWORD} FRIGATE_DRIVEWAY_RTSP_USERNAME: admin FRIGATE_DRIVEWAY_RTSP_PASSWORD: ${FRIGATE_DRIVEWAY_RTSP_PASSWORD} FRIGATE_BACK_DOOR_RTSP_USERNAME: motion diff --git a/install.yaml b/install.yaml index b5d8f48..8b17922 100644 --- a/install.yaml +++ b/install.yaml @@ -9,6 +9,8 @@ prompt: Enter password for garage camera RTSP stream user motion - name: front_door_rtsp_password prompt: Enter password for front door camera RTSP stream user motion + - name: doorbell_rtsp_password + prompt: Enter password for doorbell camera RTSP stream user admin - name: driveway_rtsp_password prompt: Enter password for driveway camera RTSP stream user admin - name: back_door_rtsp_password @@ -125,6 +127,8 @@ password: '{{garage_rtsp_password}}' front_door: password: '{{front_door_rtsp_password}}' + doorbell: + password: '{{doorbell_rtsp_password}}' driveway: password: '{{driveway_rtsp_password}}' back_door: diff --git a/start.yaml b/start.yaml index 5b87b12..28b97e2 100644 --- a/start.yaml +++ b/start.yaml @@ -39,6 +39,7 @@ IPGEOLOCATION_API_KEY: '{{frigate_config.ipgeolocation.api_key}}' FRIGATE_GARAGE_RTSP_PASSWORD: '{{frigate_config.rtsp.garage.password}}' FRIGATE_FRONT_DOOR_RTSP_PASSWORD: '{{frigate_config.rtsp.front_door.password}}' + FRIGATE_DOORBELL_RTSP_PASSWORD: '{{frigate_config.rtsp.doorbell.password}}' FRIGATE_DRIVEWAY_RTSP_PASSWORD: '{{frigate_config.rtsp.driveway.password}}' FRIGATE_BACK_DOOR_RTSP_PASSWORD: '{{frigate_config.rtsp.back_door.password}}' FRIGATE_FAMILY_ROOM_RTSP_PASSWORD: '{{frigate_config.rtsp.family_room.password}}'