jaredb7
ae94cbc189
Updated birdnet_recording.sh With a functional change around how ffmpeg is used to make use if it's functionality to accept multiple input streams and map each to a output file. Due to the original implementation generating a filename that contain the date/time streams would be writing to the same file - a small change was make each stream go to it's one file with unique filenames. Updated livestream.sh & spectrogram.php The Livestream service would fail if the RTSP stream setting was more than 1 stream (i.e comma separated list of streams) Made some improvements so streaming is possible from any of the URL's, The Spectrogram page received a new control and some Javascript that allows the user to change between streams, the setting gets saved and the livestream service restarted so it uses's the correct stream. This control is not visible if there are no RTSP streams configured By default the livestream service will stream the the first RTSP URL, if the setting is not set or invalid Updated advanced.php With a small GUI change around RTSP steam entry by providing a input field for each URL and a button to add more fields. In the background nothing changes as we use some Javascript to extract the valus entered and fill in the original rtsp_stream value with the correct comma separated string Updated server.py To work with the recording filename changes so that the correct filename is stored in the DB Updated update_birdnet_snippets.sh To support a new setting RTSP_STREAM_TO_LIVESTREAM on the Spectrogram page and in the livestream service
58 lines
2.2 KiB
Bash
Executable File
58 lines
2.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Performs the recording from the specified RSTP stream or soundcard
|
|
set -x
|
|
source /etc/birdnet/birdnet.conf
|
|
|
|
[ -z $RECORDING_LENGTH ] && RECORDING_LENGTH=15
|
|
|
|
if [ ! -z $RTSP_STREAM ];then
|
|
[ -d $RECS_DIR/StreamData ] || mkdir -p $RECS_DIR/StreamData
|
|
# Explode the RSPT steam setting into an array so we can count the number we have
|
|
RSTP_STREAMS_EXPLODED_ARRAY=(${RTSP_STREAM//,/ })
|
|
|
|
while true;do
|
|
# Original loop
|
|
# for i in ${RTSP_STREAM//,/ };do
|
|
# ffmpeg -nostdin -i ${i} -t ${RECORDING_LENGTH} -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/StreamData/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
|
|
# done
|
|
|
|
# Initially start the count off at 1 - our very first stream
|
|
RSTP_STREAMS_STARTED_COUNT=1
|
|
FFMPEG_PARAMS=""
|
|
|
|
# Loop over the streams
|
|
for i in "${RSTP_STREAMS_EXPLODED_ARRAY[@]}"
|
|
do
|
|
# Map id used to map input to output, this is 0 based in ffmpeg decrement
|
|
MAP_ID=$((RSTP_STREAMS_STARTED_COUNT-1))
|
|
# Build up the parameters to process the RSTP stream, including mapping for the output
|
|
FFMPEG_PARAMS+="-vn -thread_queue_size 512 -i ${i} -map ${MAP_ID} -t ${RECORDING_LENGTH} -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/StreamData/$(date "+%F")-birdnet-RSTP_${RSTP_STREAMS_STARTED_COUNT}-$(date "+%H:%M:%S").wav "
|
|
# Increment counter
|
|
((RSTP_STREAMS_STARTED_COUNT += 1))
|
|
done
|
|
|
|
# Make sure were passing something valid to ffmpeg, ffmpeg will run interactive and control our look by waiting ${RECORDING_LENGTH} between loops
|
|
if [ -n "$FFMPEG_PARAMS" ];then
|
|
ffmpeg -nostdin $FFMPEG_PARAMS
|
|
fi
|
|
|
|
done
|
|
else
|
|
if ! pulseaudio --check;then pulseaudio --start;fi
|
|
if pgrep arecord &> /dev/null ;then
|
|
echo "Recording"
|
|
else
|
|
until grep 5050 <(netstat -tulpn 2>&1);do
|
|
sleep 1
|
|
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-%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-%H:%M:%S.wav
|
|
fi
|
|
fi
|
|
fi
|