uuhdgd

pi/bin/video-publisher.sh

@@ -38,7 +38,7 @@ AUDIO_CHANNELS="${AUDIO_CHANNELS:-2}"
 AUDIO_OUT_RATE="${AUDIO_OUT_RATE:-16000}"
 AUDIO_OUT_CHANNELS="${AUDIO_OUT_CHANNELS:-1}"
 AUDIO_BITRATE="${AUDIO_BITRATE:-32000}"
-AUDIO_FORMAT="${AUDIO_FORMAT:-s32}"
+AUDIO_FORMAT="${AUDIO_FORMAT:-S32_LE}"
 # Flip the camera 180deg (supported by rpicam-vid/libcamera-vid)
 FLIP_ARGS=(--rotation 180)
 
@@ -95,8 +95,7 @@ run_pipeline() {
 		return
 	fi
 
-	# Audio + video path
-	if ! "${LIBCAMERA_BIN_PATH}" \
+		if ! "${LIBCAMERA_BIN_PATH}" \
 		--inline \
 		--timeout 0 \
 		--width "${VIDEO_WIDTH}" \
@@ -118,15 +117,14 @@ run_pipeline() {
 			-flags low_delay \
 			-max_interleave_delta 0 \
 			-use_wallclock_as_timestamps 1 \
-				-thread_queue_size 512 \
-				-f h264 \
-				-i pipe:0 \
-				-thread_queue_size 2048 \
-				-f alsa \
-				-sample_fmt "${AUDIO_FORMAT}" \
-				-ar "${AUDIO_RATE}" \
-				-ac "${AUDIO_CHANNELS}" \
-				-i "${AUDIO_DEVICE}" \
+			-thread_queue_size 512 \
+			-f h264 \
+			-i pipe:0 \
+			-thread_queue_size 2048 \
+			-f s32le \
+			-ar "${AUDIO_RATE}" \
+			-ac "${AUDIO_CHANNELS}" \
+			-i <(arecord -D "${AUDIO_DEVICE}" -f "${AUDIO_FORMAT}" -c "${AUDIO_CHANNELS}" -r "${AUDIO_RATE}" -q -t raw) \
 			-map 0:v:0 -map 1:a:0 \
 			-c:v copy \
 			-c:a "${AUDIO_CODEC}" \