From 0cfac796d8c511248061583fcbcddf27b9e4907d Mon Sep 17 00:00:00 2001
From: legop3 <minecratfd8@gmail.com>
Date: Fri, 28 Nov 2025 02:29:47 -0500
Subject: [PATCH] big shot

---
 pi/bin/audio-capture.sh            | 22 +++++++++++++++
 pi/bin/video-publisher.sh          | 43 ++++++++----------------------
 pi/install_roverd.sh               | 21 +++++++++++++--
 pi/systemd/audio-capture.service   | 19 +++++++++++++
 pi/systemd/video-publisher.service |  4 +--
 5 files changed, 73 insertions(+), 36 deletions(-)
 create mode 100644 pi/bin/audio-capture.sh
 create mode 100644 pi/systemd/audio-capture.service

diff --git a/pi/bin/audio-capture.sh b/pi/bin/audio-capture.sh
new file mode 100644
index 00000000..dc29ffc9
--- /dev/null
+++ b/pi/bin/audio-capture.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+FIFO="${AUDIO_FIFO:-/var/lib/roverd/audio.pcm}"
+DEVICE="${AUDIO_DEVICE:-hw:0,0}"
+RATE="${AUDIO_RATE:-48000}"
+CHANNELS="${AUDIO_CHANNELS:-2}"
+FORMAT="${AUDIO_FORMAT:-S32_LE}"
+
+prepare_fifo() {
+	install -o roverd -g audio -m 0660 /dev/null "$FIFO" 2>/dev/null || true
+	if [[ ! -p "$FIFO" ]]; then
+		rm -f "$FIFO"
+		mkfifo "$FIFO"
+		chown roverd:audio "$FIFO"
+		chmod 0660 "$FIFO"
+	fi
+}
+
+prepare_fifo
+
+exec arecord -D "$DEVICE" -f "$FORMAT" -c "$CHANNELS" -r "$RATE" -q -t raw "$FIFO"
diff --git a/pi/bin/video-publisher.sh b/pi/bin/video-publisher.sh
index 8f5c05cc..b5b6bd27 100644
--- a/pi/bin/video-publisher.sh
+++ b/pi/bin/video-publisher.sh
@@ -29,14 +29,12 @@ VIDEO_HEIGHT="${VIDEO_HEIGHT:-1080}"
 VIDEO_FPS="${VIDEO_FPS:-30}"
 VIDEO_BITRATE="${VIDEO_BITRATE:-3000000}"
 AUDIO_ENABLE="${AUDIO_ENABLE:-0}"
-AUDIO_DEVICE="${AUDIO_DEVICE:-plughw:0,0}"
+AUDIO_FIFO="${AUDIO_FIFO:-/var/lib/roverd/audio.pcm}"
 AUDIO_CODEC="${AUDIO_CODEC:-pcm_s32le}"
-# Keep the audio path simple for the Pi Zero; default to raw PCM (no encoding) and honor overrides.
+# Keep the audio path simple for the Pi Zero; raw PCM coming from the capture FIFO.
 AUDIO_RATE="${AUDIO_RATE:-48000}"
 AUDIO_CHANNELS="${AUDIO_CHANNELS:-2}"
-# AUDIO_FORMAT is the ALSA format; FFmpeg expects lowercase.
-AUDIO_FORMAT="${AUDIO_FORMAT:-S32_LE}"
-AUDIO_FORMAT_FFMPEG="$(printf '%s' "${AUDIO_FORMAT}" | tr 'A-Z' 'a-z')"
+AUDIO_FORMAT="${AUDIO_FORMAT:-s32le}"
 # Flip the camera 180deg (supported by rpicam-vid/libcamera-vid)
 FLIP_ARGS=(--rotation 180)
 
@@ -62,27 +60,15 @@ fi
 
 run_pipeline() {
 	if [[ "${AUDIO_ENABLE}" -eq 1 ]]; then
-		# Capture audio with arecord into a FIFO so ffmpeg just muxes it.
-		AUDIO_FIFO="$(mktemp -u /tmp/roverd-audio.XXXXXX)"
-		rm -f "${AUDIO_FIFO}"
-		mkfifo "${AUDIO_FIFO}"
-		ACTIVE_AUDIO_DEVICE="${AUDIO_DEVICE}"
-		ACTIVE_AUDIO_FORMAT="${AUDIO_FORMAT}"
-		ACTIVE_AUDIO_CODEC="${AUDIO_CODEC}"
-		# Background ALSA capture; keep it simple to avoid CPU on ffmpeg.
-		if ! arecord -D "${ACTIVE_AUDIO_DEVICE}" -f "${ACTIVE_AUDIO_FORMAT}" -r "${AUDIO_RATE}" -c "${AUDIO_CHANNELS}" -q -t raw "${AUDIO_FIFO}" &
-		then
-			echo "Audio capture failed (arecord, ${ACTIVE_AUDIO_DEVICE} ${ACTIVE_AUDIO_FORMAT}); falling back to video-only" >&2
+		if [[ ! -p "${AUDIO_FIFO}" ]]; then
+			echo "Audio FIFO ${AUDIO_FIFO} missing; falling back to video-only" >&2
 			AUDIO_ENABLE=0
-			rm -f "${AUDIO_FIFO}"
-		else
-			ARECORD_PID=$!
-			trap 'kill "${ARECORD_PID}" >/dev/null 2>&1 || true; wait "${ARECORD_PID}" 2>/dev/null || true; rm -f "${AUDIO_FIFO}"' EXIT INT TERM
 		fi
-		ACTIVE_AUDIO_FORMAT_FFMPEG="$(printf '%s' "${ACTIVE_AUDIO_FORMAT}" | tr 'A-Z' 'a-z')"
+	fi
 
-		# Try audio + video; if audio device is missing, fallback to video-only.
-		if [[ "${AUDIO_ENABLE}" -eq 1 ]] && ! "${LIBCAMERA_BIN_PATH}" \
+	if [[ "${AUDIO_ENABLE}" -eq 1 ]]; then
+		# Try audio + video; if FIFO is missing/empty, fallback to video-only.
+		if ! "${LIBCAMERA_BIN_PATH}" \
 			--inline \
 			--timeout 0 \
 			--width "${VIDEO_WIDTH}" \
@@ -105,12 +91,12 @@ run_pipeline() {
 				-thread_queue_size 512 \
 				-f h264 \
 				-i pipe:0 \
-				-f "${ACTIVE_AUDIO_FORMAT_FFMPEG}" \
+				-f "${AUDIO_FORMAT}" \
 				-ar "${AUDIO_RATE}" \
 				-ac "${AUDIO_CHANNELS}" \
 				-i "${AUDIO_FIFO}" \
 				-c:v copy \
-				-c:a "${ACTIVE_AUDIO_CODEC}" \
+				-c:a "${AUDIO_CODEC}" \
 				-ar:a "${AUDIO_RATE}" \
 				-ac:a "${AUDIO_CHANNELS}" \
 				-flush_packets 1 \
@@ -120,13 +106,6 @@ run_pipeline() {
 			echo "Audio pipeline failed; falling back to video-only this run" >&2
 			AUDIO_ENABLE=0
 		fi
-		if [[ -n "${ARECORD_PID:-}" ]]; then
-			kill "${ARECORD_PID}" >/dev/null 2>&1 || true
-			wait "${ARECORD_PID}" 2>/dev/null || true
-			rm -f "${AUDIO_FIFO}"
-			trap - EXIT INT TERM
-			unset ARECORD_PID
-		fi
 	fi
 
 	if [[ "${AUDIO_ENABLE}" -ne 1 ]]; then
diff --git a/pi/install_roverd.sh b/pi/install_roverd.sh
index a5e880aa..59555acd 100755
--- a/pi/install_roverd.sh
+++ b/pi/install_roverd.sh
@@ -198,6 +198,10 @@ install -D -o root -g root -m 0755 pi/bin/video-publisher.sh /usr/local/bin/vide
 log "Installed video-publisher helper"
 install -m 0644 pi/systemd/video-publisher.service /etc/systemd/system/video-publisher.service
 log "Installed video-publisher systemd unit"
+# Install audio capture assets (arecord -> FIFO)
+install -D -o root -g root -m 0755 pi/bin/audio-capture.sh /usr/local/bin/audio-capture
+install -m 0644 pi/systemd/audio-capture.service /etc/systemd/system/audio-capture.service
+log "Installed audio-capture helper + systemd unit"
 install -d -o roverd -g roverd /var/lib/roverd
 cat > /var/lib/roverd/video.env <<'ENV'
 # Managed by roverd; placeholder values will be overwritten at runtime.
@@ -213,18 +217,31 @@ AUDIO_CHANNELS=2
 ENV
 chown roverd:roverd /var/lib/roverd/video.env
 chmod 0640 /var/lib/roverd/video.env
+# Create persistent audio FIFO for capture -> publisher
+FIFO_PATH="/var/lib/roverd/audio.pcm"
+if [[ -p "$FIFO_PATH" ]]; then
+	chown roverd:audio "$FIFO_PATH"
+	chmod 0660 "$FIFO_PATH"
+else
+	rm -f "$FIFO_PATH"
+	mkfifo "$FIFO_PATH"
+	chown roverd:audio "$FIFO_PATH"
+	chmod 0660 "$FIFO_PATH"
+fi
 
 install_audio_support
 
 systemctl daemon-reload
 systemctl enable roverd.service
+systemctl enable audio-capture.service
 systemctl enable video-publisher.service
 if [[ $CONFIG_EXISTS -eq 1 ]]; then
 	systemctl restart roverd.service
+	systemctl restart audio-capture.service
 	systemctl restart video-publisher.service
-	log "Restarted roverd + video publisher"
+	log "Restarted roverd, audio-capture, video publisher"
 else
-	log "Skipped auto-start because config is the sample; edit $CONFIG_DEST then run: sudo systemctl restart roverd video-publisher"
+	log "Skipped auto-start because config is the sample; edit $CONFIG_DEST then run: sudo systemctl restart roverd audio-capture video-publisher"
 fi
 
 log "Install complete"
diff --git a/pi/systemd/audio-capture.service b/pi/systemd/audio-capture.service
new file mode 100644
index 00000000..d9a44ba7
--- /dev/null
+++ b/pi/systemd/audio-capture.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Rover Audio Capture (arecord to FIFO)
+After=network.target
+
+[Service]
+Type=simple
+User=roverd
+Group=audio
+Environment=AUDIO_FIFO=/var/lib/roverd/audio.pcm
+Environment=AUDIO_DEVICE=hw:0,0
+Environment=AUDIO_FORMAT=S32_LE
+Environment=AUDIO_RATE=48000
+Environment=AUDIO_CHANNELS=2
+ExecStart=/usr/local/bin/audio-capture
+Restart=always
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pi/systemd/video-publisher.service b/pi/systemd/video-publisher.service
index 761f8bd5..818526f7 100644
--- a/pi/systemd/video-publisher.service
+++ b/pi/systemd/video-publisher.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Rover Video Publisher (libcamera -> SRT)
-After=network-online.target roverd.service
-Wants=network-online.target
+After=network-online.target roverd.service audio-capture.service
+Wants=network-online.target audio-capture.service
 
 [Service]
 Type=simple