mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio: Bug fix: a buffer size passed to OpenAL must be a multiple of 4 (#187)

Browse Source
This commit is contained in:
Hajime Hoshi 2016-03-16 02:57:54 +09:00
parent 8f15978c83
commit 3bf9334a80
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
exp/audio/audio.go
View File

@ -51,15 +51,15 @@ func (s *mixedPlayersStream) Read(b []byte) (int, error) {
return 0, nil return 0, nil
} }
l := len(b) / 4 * 4
if len(s.context.players) == 0 { if len(s.context.players) == 0 {
l := min(len(b), x-s.writtenBytes) l := min(len(b), x-s.writtenBytes)
l &= ^3
copy(b, make([]byte, l)) copy(b, make([]byte, l))
s.writtenBytes += l s.writtenBytes += l
return l, nil return l, nil
} }
closed := []*Player{} closed := []*Player{}
ll := l l := len(b)
for p := range s.context.players { for p := range s.context.players {
_, err := p.readToBuffer(l) _, err := p.readToBuffer(l)
if err == io.EOF { if err == io.EOF {
@ -67,13 +67,14 @@ func (s *mixedPlayersStream) Read(b []byte) (int, error) {
} else if err != nil { } else if err != nil {
return 0, err return 0, err
} }
ll = min(p.bufferLength()/4*4, ll) l = min(p.bufferLength()/4*4, l)
} }
l &= ^3
b16s := [][]int16{} b16s := [][]int16{}
for p := range s.context.players { for p := range s.context.players {
b16s = append(b16s, p.bufferToInt16(ll)) b16s = append(b16s, p.bufferToInt16(l))
} }
for i := 0; i < ll/2; i++ { for i := 0; i < l/2; i++ {
x := 0 x := 0
for _, b16 := range b16s { for _, b16 := range b16s {
x += int(b16[i]) x += int(b16[i])
@ -88,13 +89,13 @@ func (s *mixedPlayersStream) Read(b []byte) (int, error) {
b[2*i+1] = byte(x >> 8) b[2*i+1] = byte(x >> 8)
} }
for p := range s.context.players { for p := range s.context.players {
p.proceed(ll) p.proceed(l)
} }
for _, p := range closed { for _, p := range closed {
delete(s.context.players, p) delete(s.context.players, p)
} }
s.writtenBytes += ll s.writtenBytes += l
return ll, nil return l, nil
} }
// TODO: Enable to specify the format like Mono8? // TODO: Enable to specify the format like Mono8?