Allow for use of audio data

This commit is contained in:
Martyn 2022-02-12 16:11:42 +01:00
parent 56d44e6f23
commit 3a8807101e
1 changed files with 25 additions and 13 deletions

View File

@ -41,15 +41,16 @@ const (
// player holds all the data // player holds all the data
// necessary for playing video. // necessary for playing video.
type player struct { type player struct {
pix *image.NRGBA pix *image.NRGBA
ticker <-chan time.Time ticker <-chan time.Time
errs <-chan error errs <-chan error
frameBuffer <-chan *image.RGBA frameBuffer <-chan *image.RGBA
audioBuffer <-chan [2]float64 audioBuffer <-chan [2]float64
last time.Time last time.Time
fps int fps int
paused bool paused bool
frameCount int64 frameCount int64
audioProcessor func([2]float64)
} }
// readVideoAndAudio reads video and audio frames // readVideoAndAudio reads video and audio frames
@ -178,6 +179,18 @@ func (p *player) readVideoAndAudio(media *reisen.Media) (<-chan *image.RGBA, <-c
return frameBuffer, sampleBuffer, errs, nil return frameBuffer, sampleBuffer, errs, nil
} }
func (p *player) SetAudioProcessorFunc(f func(data [2]float64)) {
p.audioProcessor = f
}
func (p *player) processAudioFrame(data [2]float64) {
if p.audioProcessor != nil {
p.audioProcessor(data)
} else {
_ = data
}
}
// Starts reading samples and frames // Starts reading samples and frames
// of the media file. // of the media file.
func (p *player) open(fname string) error { func (p *player) open(fname string) error {
@ -294,12 +307,11 @@ func (w *BufferedVidPlayback) Play() {
fmt.Printf("Error %s\n", err.Error()) fmt.Printf("Error %s\n", err.Error())
} }
w.fpsTimer.Reset(frameDuration) w.fpsTimer.Reset(frameDuration)
go func() { go func(p player) {
// empty the audio buffer in case that's what's jamming things up.
for { for {
_ = <-w.playerStruct.audioBuffer p.processAudioFrame(<-w.playerStruct.audioBuffer)
} }
}() }(w.playerStruct)
w.FillBuffer() w.FillBuffer()
w.videoOpened = true w.videoOpened = true
} }