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

uuhgjkf

Browse Source
This commit is contained in:
legop3
2025-11-28 02:06:43 -05:00
parent cfdaf0e11f
commit b3d6830814
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pi/bin/video-publisher.sh
+2 -12
View File
@@ -29,7 +29,7 @@ VIDEO_HEIGHT="${VIDEO_HEIGHT:-1080}"
VIDEO_FPS="${VIDEO_FPS:-30}" VIDEO_FPS="${VIDEO_FPS:-30}"
VIDEO_BITRATE="${VIDEO_BITRATE:-3000000}" VIDEO_BITRATE="${VIDEO_BITRATE:-3000000}"
AUDIO_ENABLE="${AUDIO_ENABLE:-0}" AUDIO_ENABLE="${AUDIO_ENABLE:-0}"
AUDIO_DEVICE="${AUDIO_DEVICE:-hw:0,0}" AUDIO_DEVICE="${AUDIO_DEVICE:-plughw:0,0}"
AUDIO_CODEC="${AUDIO_CODEC:-pcm_s32le}" 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}"
@@ -72,23 +72,13 @@ run_pipeline() {
# Background ALSA capture; keep it simple to avoid CPU on ffmpeg. # 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}" & if ! arecord -D "${ACTIVE_AUDIO_DEVICE}" -f "${ACTIVE_AUDIO_FORMAT}" -r "${AUDIO_RATE}" -c "${AUDIO_CHANNELS}" -q -t raw "${AUDIO_FIFO}" &
then then
echo "Audio capture failed (arecord, ${ACTIVE_AUDIO_DEVICE} ${ACTIVE_AUDIO_FORMAT}); trying fallback to plughw S16_LE" >&2 echo "Audio capture failed (arecord, ${ACTIVE_AUDIO_DEVICE} ${ACTIVE_AUDIO_FORMAT}); falling back to video-only" >&2
ACTIVE_AUDIO_DEVICE="plughw:0,0"
ACTIVE_AUDIO_FORMAT="S16_LE"
ACTIVE_AUDIO_CODEC="pcm_s16le"
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 (fallback); falling back to video-only" >&2
AUDIO_ENABLE=0 AUDIO_ENABLE=0
rm -f "${AUDIO_FIFO}" rm -f "${AUDIO_FIFO}"
else else
ARECORD_PID=$! 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 trap 'kill "${ARECORD_PID}" >/dev/null 2>&1 || true; wait "${ARECORD_PID}" 2>/dev/null || true; rm -f "${AUDIO_FIFO}"' EXIT INT TERM
fi fi
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')" ACTIVE_AUDIO_FORMAT_FFMPEG="$(printf '%s' "${ACTIVE_AUDIO_FORMAT}" | tr 'A-Z' 'a-z')"
# Try audio + video; if audio device is missing, fallback to video-only. # Try audio + video; if audio device is missing, fallback to video-only.