mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 19:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio: Refactoring: Redefine bytesPerSample

Browse Source
This commit is contained in:
Hajime Hoshi 2018-07-24 01:54:01 +09:00
parent a0bd31ef1f
commit 2969de5b1f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
audio/audio.go
View File

@ -54,10 +54,10 @@ type players struct {
const ( const (
channelNum = 2 channelNum = 2
bytesPerSample = 2 bytesPerSample = 2 * channelNum
// TODO: This assumes that channelNum is a power of 2. // TODO: This assumes that bytesPerSample is a power of 2.
mask = ^(channelNum*bytesPerSample - 1) mask = ^(bytesPerSample - 1)
) )
func (p *players) Read(b []byte) (int, error) { func (p *players) Read(b []byte) (int, error) {
@ -254,7 +254,7 @@ func (c *Context) loop() {
// e.g. a variable for JVM on Android might not be set. // e.g. a variable for JVM on Android might not be set.
<-initCh <-initCh
p, err := oto.NewPlayer(c.sampleRate, channelNum, bytesPerSample, bufferSize()) p, err := oto.NewPlayer(c.sampleRate, channelNum, bytesPerSample/channelNum, bufferSize())
if err != nil { if err != nil {
c.err = err c.err = err
return return
@ -488,7 +488,7 @@ func (p *Player) readLoop() {
case <-timerCh: case <-timerCh:
// If the buffer has 1 second, that's enough. // If the buffer has 1 second, that's enough.
if len(p.buf) >= p.sampleRate*bytesPerSample*channelNum { if len(p.buf) >= p.sampleRate*bytesPerSample {
if timer != nil { if timer != nil {
timer.Stop() timer.Stop()
} }
@ -504,7 +504,7 @@ func (p *Player) readLoop() {
} else if web.IsBrowser() { } else if web.IsBrowser() {
s = 20 s = 20
} }
l := p.sampleRate * bytesPerSample * channelNum / s l := p.sampleRate * bytesPerSample / s
l &= mask l &= mask
buf := make([]byte, l) buf := make([]byte, l)
n, err := p.src.Read(buf) n, err := p.src.Read(buf)
@ -654,7 +654,7 @@ func (p *Player) Seek(offset time.Duration) error {
if _, ok := p.src.(io.Seeker); !ok { if _, ok := p.src.(io.Seeker); !ok {
panic("audio: player to be sought must be io.Seeker") panic("audio: player to be sought must be io.Seeker")
} }
o := int64(offset) * bytesPerSample * channelNum * int64(p.sampleRate) / int64(time.Second) o := int64(offset) * bytesPerSample * int64(p.sampleRate) / int64(time.Second)
o &= mask o &= mask
select { select {
case p.seekCh <- seekArgs{o, io.SeekStart}: case p.seekCh <- seekArgs{o, io.SeekStart}:
@ -676,7 +676,7 @@ func (p *Player) Pause() error {
func (p *Player) Current() time.Duration { func (p *Player) Current() time.Duration {
sample := int64(0) sample := int64(0)
p.sync(func() { p.sync(func() {
sample = p.pos / bytesPerSample / channelNum sample = p.pos / bytesPerSample
}) })
return time.Duration(sample) * time.Second / time.Duration(p.sampleRate) return time.Duration(sample) * time.Second / time.Duration(p.sampleRate)
} }