legop3/MultiRoombaRover
1
0
Fork 0
mirror of https://github.com/legop3/MultiRoombaRover.git synced 2026-09-16 01:21:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

wuhguh

Browse Source
This commit is contained in:
legop3
2025-11-28 01:48:32 -05:00
parent e0259fe20c
commit 8be04781a5
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pi/bin/video-publisher.sh
+21 -10
View File
@@ -34,7 +34,9 @@ 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; default to raw PCM (no encoding) and honor overrides.
AUDIO_RATE="${AUDIO_RATE:-48000}" AUDIO_RATE="${AUDIO_RATE:-48000}"
AUDIO_CHANNELS="${AUDIO_CHANNELS:-1}" AUDIO_CHANNELS="${AUDIO_CHANNELS:-1}"
AUDIO_FORMAT="${AUDIO_FORMAT:-s32le}" # 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')"
# Flip the camera 180deg (supported by rpicam-vid/libcamera-vid) # Flip the camera 180deg (supported by rpicam-vid/libcamera-vid)
FLIP_ARGS=(--rotation 180) FLIP_ARGS=(--rotation 180)
@@ -65,12 +67,18 @@ run_pipeline() {
rm -f "${AUDIO_FIFO}" rm -f "${AUDIO_FIFO}"
mkfifo "${AUDIO_FIFO}" mkfifo "${AUDIO_FIFO}"
# Background ALSA capture; keep it simple to avoid CPU on ffmpeg. # Background ALSA capture; keep it simple to avoid CPU on ffmpeg.
arecord -D "${AUDIO_DEVICE}" -f "${AUDIO_FORMAT}" -r "${AUDIO_RATE}" -c "${AUDIO_CHANNELS}" -q -t raw "${AUDIO_FIFO}" & if ! arecord -D "${AUDIO_DEVICE}" -f "${AUDIO_FORMAT}" -r "${AUDIO_RATE}" -c "${AUDIO_CHANNELS}" -q -t raw "${AUDIO_FIFO}" &
ARECORD_PID=$! then
trap 'kill "${ARECORD_PID}" >/dev/null 2>&1 || true; wait "${ARECORD_PID}" 2>/dev/null || true; rm -f "${AUDIO_FIFO}"' EXIT INT TERM echo "Audio capture failed (arecord); 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
# Try audio + video; if audio device is missing, fallback to video-only. # Try audio + video; if audio device is missing, fallback to video-only.
if ! "${LIBCAMERA_BIN_PATH}" \ if [[ "${AUDIO_ENABLE}" -eq 1 ]] && ! "${LIBCAMERA_BIN_PATH}" \
--inline \ --inline \
--timeout 0 \ --timeout 0 \
--width "${VIDEO_WIDTH}" \ --width "${VIDEO_WIDTH}" \
@@ -93,7 +101,7 @@ run_pipeline() {
-thread_queue_size 512 \ -thread_queue_size 512 \
-f h264 \ -f h264 \
-i pipe:0 \ -i pipe:0 \
-f "${AUDIO_FORMAT}" \ -f "${AUDIO_FORMAT_FFMPEG}" \
-ar "${AUDIO_RATE}" \ -ar "${AUDIO_RATE}" \
-ac "${AUDIO_CHANNELS}" \ -ac "${AUDIO_CHANNELS}" \
-i "${AUDIO_FIFO}" \ -i "${AUDIO_FIFO}" \
@@ -108,10 +116,13 @@ run_pipeline() {
echo "Audio pipeline failed; falling back to video-only this run" >&2 echo "Audio pipeline failed; falling back to video-only this run" >&2
AUDIO_ENABLE=0 AUDIO_ENABLE=0
fi fi
kill "${ARECORD_PID}" >/dev/null 2>&1 || true if [[ -n "${ARECORD_PID:-}" ]]; then
wait "${ARECORD_PID}" 2>/dev/null || true kill "${ARECORD_PID}" >/dev/null 2>&1 || true
rm -f "${AUDIO_FIFO}" wait "${ARECORD_PID}" 2>/dev/null || true
trap - EXIT INT TERM rm -f "${AUDIO_FIFO}"
trap - EXIT INT TERM
unset ARECORD_PID
fi
fi fi
if [[ "${AUDIO_ENABLE}" -ne 1 ]]; then if [[ "${AUDIO_ENABLE}" -ne 1 ]]; then