mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-09-16 01:21:20 -04:00
correct mic params?
This commit is contained in:
@@ -33,7 +33,7 @@ AUDIO_DEVICE="${AUDIO_DEVICE:-hw: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}"
|
||||||
AUDIO_CHANNELS="${AUDIO_CHANNELS:-1}"
|
AUDIO_CHANNELS="${AUDIO_CHANNELS:-2}"
|
||||||
# AUDIO_FORMAT is the ALSA format; FFmpeg expects lowercase.
|
# AUDIO_FORMAT is the ALSA format; FFmpeg expects lowercase.
|
||||||
AUDIO_FORMAT="${AUDIO_FORMAT:-S32_LE}"
|
AUDIO_FORMAT="${AUDIO_FORMAT:-S32_LE}"
|
||||||
AUDIO_FORMAT_FFMPEG="$(printf '%s' "${AUDIO_FORMAT}" | tr 'A-Z' 'a-z')"
|
AUDIO_FORMAT_FFMPEG="$(printf '%s' "${AUDIO_FORMAT}" | tr 'A-Z' 'a-z')"
|
||||||
|
|||||||
@@ -209,7 +209,7 @@ VIDEO_BITRATE=2000000
|
|||||||
AUDIO_ENABLE=0
|
AUDIO_ENABLE=0
|
||||||
AUDIO_DEVICE=hw:0,0
|
AUDIO_DEVICE=hw:0,0
|
||||||
AUDIO_RATE=48000
|
AUDIO_RATE=48000
|
||||||
AUDIO_CHANNELS=1
|
AUDIO_CHANNELS=2
|
||||||
ENV
|
ENV
|
||||||
chown roverd:roverd /var/lib/roverd/video.env
|
chown roverd:roverd /var/lib/roverd/video.env
|
||||||
chmod 0640 /var/lib/roverd/video.env
|
chmod 0640 /var/lib/roverd/video.env
|
||||||
|
|||||||
+2
-2
@@ -144,7 +144,7 @@ func LoadConfig(path string) (*Config, error) {
|
|||||||
CaptureEnabled: false,
|
CaptureEnabled: false,
|
||||||
CaptureDevice: "hw:0,0",
|
CaptureDevice: "hw:0,0",
|
||||||
SampleRate: 48000,
|
SampleRate: 48000,
|
||||||
Channels: 1,
|
Channels: 2,
|
||||||
Bitrate: 24000,
|
Bitrate: 24000,
|
||||||
TTSEnabled: false,
|
TTSEnabled: false,
|
||||||
DefaultEngine: "flite",
|
DefaultEngine: "flite",
|
||||||
@@ -252,7 +252,7 @@ func validateAudioConfig(cfg *AudioConfig) {
|
|||||||
cfg.SampleRate = 48000
|
cfg.SampleRate = 48000
|
||||||
}
|
}
|
||||||
if cfg.Channels <= 0 {
|
if cfg.Channels <= 0 {
|
||||||
cfg.Channels = 1
|
cfg.Channels = 2
|
||||||
}
|
}
|
||||||
if cfg.Bitrate <= 0 {
|
if cfg.Bitrate <= 0 {
|
||||||
cfg.Bitrate = 64000
|
cfg.Bitrate = 64000
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ func UpdatePublisherEnv(media MediaConfig, audio AudioConfig) error {
|
|||||||
audio.SampleRate = 48000
|
audio.SampleRate = 48000
|
||||||
}
|
}
|
||||||
if audio.Channels <= 0 {
|
if audio.Channels <= 0 {
|
||||||
audio.Channels = 1
|
audio.Channels = 2
|
||||||
}
|
}
|
||||||
fmt.Fprintf(&buf, "AUDIO_ENABLE=%d\n", boolToInt(audio.CaptureEnabled))
|
fmt.Fprintf(&buf, "AUDIO_ENABLE=%d\n", boolToInt(audio.CaptureEnabled))
|
||||||
fmt.Fprintf(&buf, "AUDIO_DEVICE=%s\n", audioDevice)
|
fmt.Fprintf(&buf, "AUDIO_DEVICE=%s\n", audioDevice)
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ audio:
|
|||||||
captureEnabled: false
|
captureEnabled: false
|
||||||
captureDevice: hw:0,0
|
captureDevice: hw:0,0
|
||||||
sampleRate: 48000
|
sampleRate: 48000
|
||||||
channels: 1
|
channels: 2
|
||||||
bitrate: 24000
|
bitrate: 24000
|
||||||
ttsEnabled: false
|
ttsEnabled: false
|
||||||
defaultEngine: flite
|
defaultEngine: flite
|
||||||
|
|||||||
Reference in New Issue
Block a user