mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-24 10:48:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio: Bug fix: Write can block and needs to be called asynchronously (#373)

Browse Source
This commit is contained in:
Hajime Hoshi 2017-06-29 03:36:19 +09:00
parent ba86d37ce8
commit 1fe2d90d8a
1 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
audio/audio.go
View File

@ -170,11 +170,13 @@ func (p *players) hasSource(src ReadSeekCloser) bool {
// You can also call Update independently from the game loop as 'async mode'. // You can also call Update independently from the game loop as 'async mode'.
// In this case, audio goes on even when the game stops e.g. by diactivating the screen. // In this case, audio goes on even when the game stops e.g. by diactivating the screen.
type Context struct { type Context struct {
players *players players *players
driver *oto.Player playerWriteCh chan []uint8
sampleRate int playerErrCh chan error
frames int64 playerCloseCh chan struct{}
writtenBytes int64 sampleRate int
frames int64
writtenBytes int64
} }
var ( var (
@ -214,40 +216,62 @@ func NewContext(sampleRate int) (*Context, error) {
// //
// Update returns error when IO error occurs in the underlying IO object. // Update returns error when IO error occurs in the underlying IO object.
func (c *Context) Update() error { func (c *Context) Update() error {
// Initialize c.driver lazily to enable calling NewContext in an 'init' function. // Initialize oto.Player lazily to enable calling NewContext in an 'init' function.
// Accessing driver functions requires the environment to be already initialized, // Accessing oto.Player functions requires the environment to be already initialized,
// but if Ebiten is used for a shared library, the timing when init functions are called // but if Ebiten is used for a shared library, the timing when init functions are called
// is unexpectable. // is unexpectable.
// e.g. a variable for JVM on Android might not be set. // e.g. a variable for JVM on Android might not be set.
if c.driver == nil { if c.playerWriteCh == nil {
// The buffer size is 1/15 sec. init := make(chan error)
// It looks like 1/20 sec is too short for Android. c.playerWriteCh = make(chan []uint8)
s := c.sampleRate * channelNum * bytesPerSample / 15 c.playerErrCh = make(chan error, 1)
p, err := oto.NewPlayer(c.sampleRate, channelNum, bytesPerSample, s) c.playerCloseCh = make(chan struct{})
c.driver = p go func() {
if err != nil { // The buffer size is 1/15 sec.
// It looks like 1/20 sec is too short for Android.
s := c.sampleRate * channelNum * bytesPerSample / 15
p, err := oto.NewPlayer(c.sampleRate, channelNum, bytesPerSample, s)
if err != nil {
init <- err
return
}
defer p.Close()
close(init)
for {
select {
case buf := <-c.playerWriteCh:
if _, err = p.Write(buf); err != nil {
c.playerErrCh <- err
}
case <-c.playerCloseCh:
return
}
}
}()
if err := <-init; err != nil {
return err return err
} }
} }
select {
case err := <-c.playerErrCh:
close(c.playerCloseCh)
return err
default:
}
c.frames++ c.frames++
bytesPerFrame := c.sampleRate * bytesPerSample * channelNum / ebiten.FPS bytesPerFrame := c.sampleRate * bytesPerSample * channelNum / ebiten.FPS
l := (c.frames * int64(bytesPerFrame)) - c.writtenBytes l := (c.frames * int64(bytesPerFrame)) - c.writtenBytes
l &= mask l &= mask
c.writtenBytes += l c.writtenBytes += l
buf := make([]uint8, l) buf := make([]uint8, l)
n, err := io.ReadFull(c.players, buf) if _, err := io.ReadFull(c.players, buf); err != nil {
if err != nil { close(c.playerCloseCh)
return err return err
} }
if n != len(buf) { select {
return c.driver.Close() case c.playerWriteCh <- buf:
} // Writing can block. Don't wait for the result here.
_, err = c.driver.Write(buf) default:
if err == io.EOF {
return c.driver.Close()
}
if err != nil {
return err
} }
return nil return nil
} }