Skip to content

Propagate errors in audio combine pipeline; init speaker once #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phyceClaw wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Propagate errors in audio combine pipeline; init speaker once #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 46 additions & 40 deletions app/common/audio/audio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,74 +39,80 @@ func CombineWAVFiles(dirPath, outputFilename string, pauseDuration time.Duration
}

for index, wavPath := range wavFiles {
file, err := os.Open(wavPath)
defer file.Close()
if err != nil {
return err
}

decoder := wav.NewDecoder(file)
if !decoder.IsValidFile() {
return response.Err(fmt.Errorf("Invalid WAV file: " + wavPath))
}
if err := func() error {
file, err := os.Open(wavPath)
if err != nil {
return err
}
defer file.Close()

pcmBuffer, err := decoder.FullPCMBuffer()
if err != nil {
return response.Err(err)
}
decoder := wav.NewDecoder(file)
if !decoder.IsValidFile() {
return response.Err(fmt.Errorf("Invalid WAV file: " + wavPath))
}

if pcmBuffer.Format.SampleRate != sampleRate {
pcmBuffer, err = ResampleBuffer(pcmBuffer, sampleRate)
pcmBuffer, err := decoder.FullPCMBuffer()
if err != nil {
response.Err(err)
return response.Err(err)
}
}

if pcmBuffer.Format.NumChannels != channelCount {
pcmBuffer, err = ChangeChannelCount(pcmBuffer, channelCount)
if err != nil {
response.Err(err)
if pcmBuffer.Format.SampleRate != sampleRate {
pcmBuffer, err = ResampleBuffer(pcmBuffer, sampleRate)
if err != nil {
return response.Err(err)
}
}
}

if pcmBuffer.SourceBitDepth != bitDepth {
pcmBuffer, err = ChangeBitDepth(pcmBuffer, bitDepth)
if err != nil {
response.Err(err)
if pcmBuffer.Format.NumChannels != channelCount {
pcmBuffer, err = ChangeChannelCount(pcmBuffer, channelCount)
if err != nil {
return response.Err(err)
}
}
}

if index == 0 {
combinedBuffer = &audio.IntBuffer{
Data: []int{},
Format: pcmBuffer.Format,
SourceBitDepth: pcmBuffer.SourceBitDepth,
if pcmBuffer.SourceBitDepth != bitDepth {
pcmBuffer, err = ChangeBitDepth(pcmBuffer, bitDepth)
if err != nil {
return response.Err(err)
}
}
}

combinedBuffer.Data = append(combinedBuffer.Data, pcmBuffer.Data...)
if index == 0 {
combinedBuffer = &audio.IntBuffer{
Data: []int{},
Format: pcmBuffer.Format,
SourceBitDepth: pcmBuffer.SourceBitDepth,
}
}

if index < len(wavFiles)-1 {
combinedBuffer.Data = append(combinedBuffer.Data, silenceBuffer.Data...)
combinedBuffer.Data = append(combinedBuffer.Data, pcmBuffer.Data...)

if index < len(wavFiles)-1 {
combinedBuffer.Data = append(combinedBuffer.Data, silenceBuffer.Data...)
}

return nil
}(); err != nil {
return err
}
}

outputPath := filepath.Join(dirPath, outputFilename)
combinedFile, err := os.Create(outputPath)
if err != nil {
response.Err(err)
return response.Err(err)
}
defer combinedFile.Close()

encoder := wav.NewEncoder(combinedFile, sampleRate, bitDepth, channelCount, 1)
err = encoder.Write(combinedBuffer)
if err != nil {
response.Err(err)
return response.Err(err)
}

err = encoder.Close()
if err != nil {
response.Err(err)
return response.Err(err)
}

return nil
Expand Down
10 changes: 8 additions & 2 deletions app/common/audio/player/player.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"os"
"path/filepath"
"strings"
"sync"
"time"

"github.com/gopxl/beep"
Expand All @@ -15,6 +16,10 @@ import (
"github.com/gopxl/beep/wav"
)

const targetRate = beep.SampleRate(48000)

var speakerInitOnce sync.Once

func PlayAudioFile(filePath string) error {
if _, err := os.Stat(filePath); os.IsNotExist(err) {
return fmt.Errorf("file not found: %s", filePath)
Expand Down Expand Up @@ -48,8 +53,9 @@ func PlayAudioFile(filePath string) error {
}
defer streamer.Close()

targetRate := beep.SampleRate(48000)
speaker.Init(targetRate, targetRate.N(time.Second/10))
speakerInitOnce.Do(func() {
speaker.Init(targetRate, targetRate.N(time.Second/10))
})

var finalStreamer beep.Streamer = streamer
if format.SampleRate != targetRate {
Expand Down