Date: Mon, 25 Apr 2022 10:19:01 -0400
Subject: [PATCH 09/12] I dont' know how I messed up the first versions so
badly, but this one is working
---
scripts/birdnet_recording.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index e2ea480..1f1cd8d 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -18,11 +18,11 @@ else
done
if [ -z ${REC_CARD} ];then
arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\
- --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-$(date "+%F").wav
+ --use-strftime ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-%H:%M:%S.wav
else
arecord -f S16_LE -c${CHANNELS} -r48000 -t wav --max-file-time ${RECORDING_LENGTH}\
-D "${REC_CARD}" --use-strftime \
- ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-$(date "+%F").wav
+ ${RECS_DIR}/%B-%Y/%d-%A/%F-birdnet-%H:%M:%S.wav
fi
fi
fi
From ff9f3552712c4fbb0066789eebd7555116a7bb3e Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Mon, 25 Apr 2022 10:24:23 -0400
Subject: [PATCH 10/12] Update livestream.sh
---
scripts/livestream.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/scripts/livestream.sh b/scripts/livestream.sh
index bdebba7..d081d53 100755
--- a/scripts/livestream.sh
+++ b/scripts/livestream.sh
@@ -4,8 +4,12 @@ source /etc/birdnet/birdnet.conf
if [ -z ${REC_CARD} ];then
echo "Stream not supported"
-else
- ffmpeg -loglevel 52 -ac ${CHANNELS} -f alsa -i ${REC_CARD} -acodec libmp3lame \
+elif [[ ! -z ${RTSP_STREAM} ]];then
+ ffmpeg -loglevel 52 -ac ${CHANNELS} -i ${RTSP_STREAM} -acodec libmp3lame \
-b:a 320k -ac ${CHANNELS} -content_type 'audio/mpeg' \
-f mp3 icecast://source:${ICE_PWD}@localhost:8000/stream -re
-fi
+else
+ ffmpeg -loglevel 52 -ac ${CHANNELS} -f alsa -i ${REC_CARD} -acodec libmp3lame \
+ -b:a 320k -ac ${CHANNELS} -content_type 'audio/mpeg' \
+ -f mp3 icecast://source:${ICE_PWD}@localhost:8000/stream -re
+fi
\ No newline at end of file
From 256b405c214be6ee7fdeeb6097018a5eb7b041bf Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Mon, 25 Apr 2022 16:51:04 -0400
Subject: [PATCH 11/12] Allowing multiple RTSP stream urls
(untested)
---
scripts/advanced.php | 18 +++++++++---------
scripts/birdnet_recording.sh | 4 +++-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/scripts/advanced.php b/scripts/advanced.php
index 4a60f71..204dd0a 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -65,7 +65,7 @@ if(isset($_GET['submit'])) {
}
if(isset($_GET["rtsp_stream"])) {
- $rtsp_stream = $_GET["rtsp_stream"];
+ $rtsp_stream = str_replace("\r\n", ",", $_GET["rtsp_stream"]);
if(strcmp($rtsp_stream,$config['RTSP_STREAM']) !== 0) {
$contents = preg_replace("/RTSP_STREAM=.*/", "RTSP_STREAM=$rtsp_stream", $contents);
$contents2 = preg_replace("/RTSP_STREAM=.*/", "RTSP_STREAM=$rtsp_stream", $contents2);
@@ -76,7 +76,7 @@ if(isset($_GET['submit'])) {
exec('sudo systemctl restart birdnet_recording.service');
}
}
-
+
if(isset($_GET["overlap"])) {
$overlap = $_GET["overlap"];
if(strcmp($overlap,$config['OVERLAP']) !== 0) {
@@ -121,14 +121,14 @@ if(isset($_GET['submit'])) {
$contents2 = preg_replace("/PRIVACY_MODE=.*/", "PRIVACY_MODE=$privacy_mode", $contents2);
if(strcmp($privacy_mode,"on") == 0) {
exec('sudo sed -i \'s/\/usr\/local\/bin\/server.py/\/usr\/local\/bin\/privacy_server.py/g\' ../../BirdNET-Pi/templates/birdnet_server.service');
- exec('sudo systemctl daemon-reload');
- exec('restart_services.sh');
- header('Location: /log');
+ exec('sudo systemctl daemon-reload');
+ exec('restart_services.sh');
+ header('Location: /log');
} elseif(strcmp($privacy_mode,"off") == 0) {
exec('sudo sed -i \'s/\/usr\/local\/bin\/privacy_server.py/\/usr\/local\/bin\/server.py/g\' ../../BirdNET-Pi/templates/birdnet_server.service');
- exec('sudo systemctl daemon-reload');
- exec('restart_services.sh');
- header('Location: /log');
+ exec('sudo systemctl daemon-reload');
+ exec('restart_services.sh');
+ header('Location: /log');
}
}
}
@@ -215,7 +215,7 @@ if (file_exists('./scripts/thisrun.txt')) {
Set Channels to the number of channels supported by your sound card. 32 max.
-
+
If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source.
diff --git a/scripts/birdnet_recording.sh b/scripts/birdnet_recording.sh
index 1f1cd8d..ccd1024 100755
--- a/scripts/birdnet_recording.sh
+++ b/scripts/birdnet_recording.sh
@@ -6,7 +6,9 @@ source /etc/birdnet/birdnet.conf
if [ ! -z $RTSP_STREAM ];then
while true;do
- ffmpeg -i $RTSP_STREAM -t 15 -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
+ for i in ${RTSP_STREAM//,/ };do
+ ffmpeg -i ${i} -t 15 -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav /dev/null 2>&1 & sleep 1;
+ done
done
else
if ! pulseaudio --check;then pulseaudio --start;fi
From 8864bdf280f41ccbc353516f56d6d8d34c43386f Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Mon, 25 Apr 2022 16:53:30 -0400
Subject: [PATCH 12/12] Update advanced.php
---
scripts/advanced.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/advanced.php b/scripts/advanced.php
index 204dd0a..b73bfbe 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -216,7 +216,7 @@ if (file_exists('./scripts/thisrun.txt')) {
Set Channels to the number of channels supported by your sound card. 32 max.
- If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source.
+ If you place an RTSP stream URL here, BirdNET-Pi will use that as its audio source. If you have multiple streams, each URL should be on its own line.
Set Recording Length in seconds between 6 and 60. Multiples of 3 are recommended, as BirdNET analyzes in 3-second chunks.