nonoo/kappanhang
1
0
Fork 0
mirror of https://github.com/nonoo/kappanhang.git synced 2026-01-20 15:40:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix audio delay if nothing is reading the virtual sound card

Browse source
This commit is contained in:
Nonoo 2020-10-28 18:02:44 +01:00
parent 330f6175de
commit 757dc58280
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
audio-linux.go
View file

@ -13,7 +13,10 @@ import (
)
const audioSampleRate = 48000
const audioBufferLength = 100 * time.Millisecond
const audioSampleBytes = 2
const pulseAudioBufferLength = 100 * time.Millisecond
const audioFrameSize = 1920 // 20ms
const maxPlayBufferSize = audioFrameSize * 5
type audioStruct struct {
source papipes.Source
@ -43,12 +46,12 @@ func (a *audioStruct) playLoop(deinitNeededChan, deinitFinishedChan chan bool) {
for {
a.mutex.Lock()
if a.playBuf.Len() < 1920 {
if a.playBuf.Len() < audioFrameSize {
a.mutex.Unlock()
break
}
d := make([]byte, 1920)
d := make([]byte, audioFrameSize)
bytesToWrite, err := a.playBuf.Read(d)
a.mutex.Unlock()
if err != nil {
@ -83,7 +86,7 @@ func (a *audioStruct) recLoop(deinitNeededChan, deinitFinishedChan chan bool) {
deinitFinishedChan <- true
}()
frameBuf := make([]byte, 1920)
frameBuf := make([]byte, audioFrameSize)
buf := bytes.NewBuffer([]byte{})
for {
@ -151,6 +154,11 @@ func (a *audioStruct) loop() {
}
a.mutex.Lock()
free := maxPlayBufferSize - a.playBuf.Len()
if free < len(d) {
b := make([]byte, len(d)-free)
_, _ = a.playBuf.Read(b)
}
a.playBuf.Write(d)
a.mutex.Unlock()
@ -163,7 +171,7 @@ func (a *audioStruct) loop() {
}
func (a *audioStruct) init(devName string) error {
bufferSizeInBits := (audioSampleRate * 16) / 1000 * audioBufferLength.Milliseconds()
bufferSizeInBits := (audioSampleRate * audioSampleBytes * 8) / 1000 * pulseAudioBufferLength.Milliseconds()
a.source.Name = "kappanhang-" + devName
a.source.Filename = "/tmp/kappanhang-" + devName + ".source"