diff --git a/pi/bin/video-publisher.sh b/pi/bin/video-publisher.sh index 9f8ace08..2f7ef6f8 100644 --- a/pi/bin/video-publisher.sh +++ b/pi/bin/video-publisher.sh @@ -30,11 +30,10 @@ VIDEO_FPS="${VIDEO_FPS:-30}" VIDEO_BITRATE="${VIDEO_BITRATE:-3000000}" AUDIO_ENABLE="${AUDIO_ENABLE:-0}" AUDIO_DEVICE="${AUDIO_DEVICE:-hw:0,0}" -AUDIO_CODEC="${AUDIO_CODEC:-pcm_mulaw}" -# Keep the audio path simple for the Pi Zero; default to G.711 mu-law (very light) and honor overrides. -AUDIO_RATE="${AUDIO_RATE:-8000}" +AUDIO_CODEC="${AUDIO_CODEC:-pcm_s32le}" +# Keep the audio path simple for the Pi Zero; default to raw PCM (no encoding) and honor overrides. +AUDIO_RATE="${AUDIO_RATE:-48000}" AUDIO_CHANNELS="${AUDIO_CHANNELS:-1}" -AUDIO_DEVICE="${AUDIO_DEVICE:-plughw:0,0}" # Flip the camera 180deg (supported by rpicam-vid/libcamera-vid) FLIP_ARGS=(--rotation 180) diff --git a/pi/install_roverd.sh b/pi/install_roverd.sh index 408aeac2..2142307b 100755 --- a/pi/install_roverd.sh +++ b/pi/install_roverd.sh @@ -208,7 +208,7 @@ VIDEO_FPS=30 VIDEO_BITRATE=2000000 AUDIO_ENABLE=0 AUDIO_DEVICE=hw:0,0 -AUDIO_RATE=8000 +AUDIO_RATE=48000 AUDIO_CHANNELS=1 ENV chown roverd:roverd /var/lib/roverd/video.env diff --git a/pi/roverd/config.go b/pi/roverd/config.go index 639f0afd..9714e84f 100644 --- a/pi/roverd/config.go +++ b/pi/roverd/config.go @@ -143,7 +143,7 @@ func LoadConfig(path string) (*Config, error) { Audio: AudioConfig{ CaptureEnabled: false, CaptureDevice: "hw:0,0", - SampleRate: 8000, + SampleRate: 48000, Channels: 1, Bitrate: 24000, TTSEnabled: false, @@ -249,7 +249,7 @@ func validateAudioConfig(cfg *AudioConfig) { cfg.CaptureDevice = "hw:0,0" } if cfg.SampleRate <= 0 { - cfg.SampleRate = 8000 + cfg.SampleRate = 48000 } if cfg.Channels <= 0 { cfg.Channels = 1 diff --git a/pi/roverd/media_env.go b/pi/roverd/media_env.go index c5898187..4931607c 100644 --- a/pi/roverd/media_env.go +++ b/pi/roverd/media_env.go @@ -30,7 +30,7 @@ func UpdatePublisherEnv(media MediaConfig, audio AudioConfig) error { audioDevice = "hw:0,0" } if audio.SampleRate <= 0 { - audio.SampleRate = 8000 + audio.SampleRate = 48000 } if audio.Channels <= 0 { audio.Channels = 1 diff --git a/pi/roverd/roverd.sample.yaml b/pi/roverd/roverd.sample.yaml index 15db2062..7cae8915 100644 --- a/pi/roverd/roverd.sample.yaml +++ b/pi/roverd/roverd.sample.yaml @@ -40,7 +40,7 @@ cameraServo: audio: captureEnabled: false captureDevice: hw:0,0 - sampleRate: 8000 + sampleRate: 48000 channels: 1 bitrate: 24000 ttsEnabled: false