mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-09-17 01:50:47 -04:00
stop transcoding audio please
This commit is contained in:
@@ -31,10 +31,10 @@ VIDEO_BITRATE="${VIDEO_BITRATE:-3000000}"
|
|||||||
AUDIO_ENABLE="${AUDIO_ENABLE:-0}"
|
AUDIO_ENABLE="${AUDIO_ENABLE:-0}"
|
||||||
AUDIO_DEVICE="${AUDIO_DEVICE:-plughw:0,0}"
|
AUDIO_DEVICE="${AUDIO_DEVICE:-plughw:0,0}"
|
||||||
AUDIO_CODEC="pcm_s16le"
|
AUDIO_CODEC="pcm_s16le"
|
||||||
# Keep the audio path simple for the Pi Zero; we hardcode a single PCM profile.
|
# Keep the audio path simple for the Pi Zero; default to PCM, and honor any rate/channels provided.
|
||||||
AUDIO_RATE=16000
|
AUDIO_RATE="${AUDIO_RATE:-48000}"
|
||||||
AUDIO_CHANNELS=1
|
AUDIO_CHANNELS="${AUDIO_CHANNELS:-1}"
|
||||||
AUDIO_DEVICE="plughw:0,0"
|
AUDIO_DEVICE="${AUDIO_DEVICE:-plughw:0,0}"
|
||||||
# Flip the camera 180deg (supported by rpicam-vid/libcamera-vid)
|
# Flip the camera 180deg (supported by rpicam-vid/libcamera-vid)
|
||||||
FLIP_ARGS=(--rotation 180)
|
FLIP_ARGS=(--rotation 180)
|
||||||
|
|
||||||
|
|||||||
@@ -207,8 +207,8 @@ VIDEO_HEIGHT=720
|
|||||||
VIDEO_FPS=30
|
VIDEO_FPS=30
|
||||||
VIDEO_BITRATE=2000000
|
VIDEO_BITRATE=2000000
|
||||||
AUDIO_ENABLE=0
|
AUDIO_ENABLE=0
|
||||||
AUDIO_DEVICE=plughw:0,0
|
AUDIO_DEVICE=hw:0,0
|
||||||
AUDIO_RATE=16000
|
AUDIO_RATE=48000
|
||||||
AUDIO_CHANNELS=1
|
AUDIO_CHANNELS=1
|
||||||
ENV
|
ENV
|
||||||
chown roverd:roverd /var/lib/roverd/video.env
|
chown roverd:roverd /var/lib/roverd/video.env
|
||||||
|
|||||||
+4
-4
@@ -142,8 +142,8 @@ func LoadConfig(path string) (*Config, error) {
|
|||||||
},
|
},
|
||||||
Audio: AudioConfig{
|
Audio: AudioConfig{
|
||||||
CaptureEnabled: false,
|
CaptureEnabled: false,
|
||||||
CaptureDevice: "plughw:0,0",
|
CaptureDevice: "hw:0,0",
|
||||||
SampleRate: 16000,
|
SampleRate: 48000,
|
||||||
Channels: 1,
|
Channels: 1,
|
||||||
Bitrate: 24000,
|
Bitrate: 24000,
|
||||||
TTSEnabled: false,
|
TTSEnabled: false,
|
||||||
@@ -246,10 +246,10 @@ func clampFloat(value, min, max float64) float64 {
|
|||||||
|
|
||||||
func validateAudioConfig(cfg *AudioConfig) {
|
func validateAudioConfig(cfg *AudioConfig) {
|
||||||
if cfg.CaptureEnabled && cfg.CaptureDevice == "" {
|
if cfg.CaptureEnabled && cfg.CaptureDevice == "" {
|
||||||
cfg.CaptureDevice = "default"
|
cfg.CaptureDevice = "hw:0,0"
|
||||||
}
|
}
|
||||||
if cfg.SampleRate <= 0 {
|
if cfg.SampleRate <= 0 {
|
||||||
cfg.SampleRate = 16000
|
cfg.SampleRate = 48000
|
||||||
}
|
}
|
||||||
if cfg.Channels <= 0 {
|
if cfg.Channels <= 0 {
|
||||||
cfg.Channels = 1
|
cfg.Channels = 1
|
||||||
|
|||||||
@@ -27,10 +27,10 @@ func UpdatePublisherEnv(media MediaConfig, audio AudioConfig) error {
|
|||||||
fmt.Fprintf(&buf, "VIDEO_BITRATE=%d\n", media.VideoBitrate)
|
fmt.Fprintf(&buf, "VIDEO_BITRATE=%d\n", media.VideoBitrate)
|
||||||
audioDevice := audio.CaptureDevice
|
audioDevice := audio.CaptureDevice
|
||||||
if audioDevice == "" {
|
if audioDevice == "" {
|
||||||
audioDevice = "plughw:0,0"
|
audioDevice = "hw:0,0"
|
||||||
}
|
}
|
||||||
if audio.SampleRate <= 0 {
|
if audio.SampleRate <= 0 {
|
||||||
audio.SampleRate = 16000
|
audio.SampleRate = 48000
|
||||||
}
|
}
|
||||||
if audio.Channels <= 0 {
|
if audio.Channels <= 0 {
|
||||||
audio.Channels = 1
|
audio.Channels = 1
|
||||||
|
|||||||
@@ -39,8 +39,8 @@ cameraServo:
|
|||||||
allowRawPulse: false
|
allowRawPulse: false
|
||||||
audio:
|
audio:
|
||||||
captureEnabled: false
|
captureEnabled: false
|
||||||
captureDevice: plughw:0,0
|
captureDevice: hw:0,0
|
||||||
sampleRate: 16000
|
sampleRate: 48000
|
||||||
channels: 1
|
channels: 1
|
||||||
bitrate: 24000
|
bitrate: 24000
|
||||||
ttsEnabled: false
|
ttsEnabled: false
|
||||||
|
|||||||
Reference in New Issue
Block a user