diff --git a/pi/bin/video-publisher.sh b/pi/bin/video-publisher.sh index dcd06a3b..2d5115aa 100644 --- a/pi/bin/video-publisher.sh +++ b/pi/bin/video-publisher.sh @@ -20,15 +20,15 @@ VIDEO_FPS="${VIDEO_FPS:-30}" VIDEO_BITRATE="${VIDEO_BITRATE:-3000000}" AUDIO_ENABLE="${AUDIO_ENABLE:-0}" AUDIO_DEVICE="${AUDIO_DEVICE:-plughw:0,0}" -AUDIO_RATE="${AUDIO_RATE:-48000}" -AUDIO_CHANNELS="${AUDIO_CHANNELS:-2}" -AUDIO_BITRATE="${AUDIO_BITRATE:-32000}" +AUDIO_RATE="${AUDIO_RATE:-8000}" +AUDIO_CHANNELS="${AUDIO_CHANNELS:-1}" +AUDIO_BITRATE="${AUDIO_BITRATE:-64000}" # Normalize device/rate to match the HAT capture (2ch/48k S32_LE); plughw handles any minor conversions. AUDIO_DEVICE="plughw:0,0" -AUDIO_RATE=48000 -AUDIO_CHANNELS=2 -AUDIO_BITRATE=32000 +AUDIO_RATE=8000 +AUDIO_CHANNELS=1 +AUDIO_BITRATE=64000 # Flip the camera 180deg (supported by rpicam-vid/libcamera-vid) FLIP_ARGS=(--rotation 180) @@ -87,8 +87,7 @@ run_pipeline() { -ar "${AUDIO_RATE}" \ -i "${AUDIO_DEVICE}" \ -c:v copy \ - -c:a aac \ - -b:a "${AUDIO_BITRATE}" \ + -c:a pcm_mulaw \ -ac:a "${AUDIO_CHANNELS}" \ -ar:a "${AUDIO_RATE}" \ -af "aresample=async=1:min_hard_comp=0.050:first_pts=0" \ diff --git a/pi/install_roverd.sh b/pi/install_roverd.sh index ce40f20d..86c2c9b3 100755 --- a/pi/install_roverd.sh +++ b/pi/install_roverd.sh @@ -206,9 +206,9 @@ VIDEO_FPS=30 VIDEO_BITRATE=3000000 AUDIO_ENABLE=1 AUDIO_DEVICE=plughw:0,0 -AUDIO_RATE=48000 -AUDIO_CHANNELS=2 -AUDIO_BITRATE=32000 +AUDIO_RATE=8000 +AUDIO_CHANNELS=1 +AUDIO_BITRATE=64000 ENV chown roverd:roverd /var/lib/roverd/video.env chmod 0640 /var/lib/roverd/video.env diff --git a/pi/roverd/config.go b/pi/roverd/config.go index a6a732b8..92da69fb 100644 --- a/pi/roverd/config.go +++ b/pi/roverd/config.go @@ -143,9 +143,9 @@ func LoadConfig(path string) (*Config, error) { Audio: AudioConfig{ CaptureEnabled: true, CaptureDevice: "plughw:0,0", - SampleRate: 48000, - Channels: 2, - Bitrate: 32000, + SampleRate: 8000, + Channels: 1, + Bitrate: 64000, TTSEnabled: false, DefaultEngine: "flite", DefaultVoice: "rms", diff --git a/pi/roverd/roverd.sample.yaml b/pi/roverd/roverd.sample.yaml index 1b455080..28b50542 100644 --- a/pi/roverd/roverd.sample.yaml +++ b/pi/roverd/roverd.sample.yaml @@ -40,9 +40,9 @@ cameraServo: audio: captureEnabled: true captureDevice: plughw:0,0 - sampleRate: 48000 - channels: 2 - bitrate: 32000 + sampleRate: 8000 + channels: 1 + bitrate: 64000 ttsEnabled: false defaultEngine: flite defaultVoice: rms