diff --git a/pi/bin/video-publisher.sh b/pi/bin/video-publisher.sh index 7137f858..ea6dc42e 100644 --- a/pi/bin/video-publisher.sh +++ b/pi/bin/video-publisher.sh @@ -22,13 +22,13 @@ 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:-64000}" +AUDIO_BITRATE="${AUDIO_BITRATE:-32000}" # 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=64000 +AUDIO_BITRATE=32000 # Flip the camera 180deg (supported by rpicam-vid/libcamera-vid) FLIP_ARGS=(--rotation 180) @@ -87,9 +87,10 @@ run_pipeline() { -ar "${AUDIO_RATE}" \ -i "${AUDIO_DEVICE}" \ -c:v copy \ - -c:a pcm_s16le \ - -ac "${AUDIO_CHANNELS}" \ - -ar "${AUDIO_RATE}" \ + -c:a aac \ + -b:a "${AUDIO_BITRATE}" \ + -ac:a 1 \ + -ar:a 24000 \ -flush_packets 1 \ -f mpegts \ "${PUBLISH_URL}" diff --git a/pi/install_roverd.sh b/pi/install_roverd.sh index c738df56..ce40f20d 100755 --- a/pi/install_roverd.sh +++ b/pi/install_roverd.sh @@ -208,7 +208,7 @@ AUDIO_ENABLE=1 AUDIO_DEVICE=plughw:0,0 AUDIO_RATE=48000 AUDIO_CHANNELS=2 -AUDIO_BITRATE=64000 +AUDIO_BITRATE=32000 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 1a35ebb2..a6a732b8 100644 --- a/pi/roverd/config.go +++ b/pi/roverd/config.go @@ -145,7 +145,7 @@ func LoadConfig(path string) (*Config, error) { CaptureDevice: "plughw:0,0", SampleRate: 48000, Channels: 2, - Bitrate: 64000, + Bitrate: 32000, TTSEnabled: false, DefaultEngine: "flite", DefaultVoice: "rms", diff --git a/pi/roverd/roverd.sample.yaml b/pi/roverd/roverd.sample.yaml index 024eba98..1b455080 100644 --- a/pi/roverd/roverd.sample.yaml +++ b/pi/roverd/roverd.sample.yaml @@ -42,7 +42,7 @@ audio: captureDevice: plughw:0,0 sampleRate: 48000 channels: 2 - bitrate: 64000 + bitrate: 32000 ttsEnabled: false defaultEngine: flite defaultVoice: rms