mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-27 03:02:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio/vorbis: Read some data before actual using (#297)

Browse Source
This commit is contained in:
Hajime Hoshi 2016-11-30 12:00:53 +09:00
parent 741ce9c7b8
commit 51da710860
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/vorbis/vorbis.go
View File

@ -33,8 +33,8 @@ type decoded struct {
func (d *decoded) readUntil(posInBytes int) error { func (d *decoded) readUntil(posInBytes int) error {
c := 0 c := 0
buffer := make([]float32, 8192)
for len(d.data) < posInBytes/2 { for len(d.data) < posInBytes/2 {
buffer := make([]float32, 8192)
n, err := d.decoder.Read(buffer) n, err := d.decoder.Read(buffer)
if n > 0 { if n > 0 {
d.data = append(d.data, buffer[:n]...) d.data = append(d.data, buffer[:n]...)
@ -56,7 +56,7 @@ func (d *decoded) readUntil(posInBytes int) error {
return nil return nil
} }
func (d *decoded) Read(b []byte) (int, error) { func (d *decoded) Read(b []uint8) (int, error) {
total := d.totalBytes total := d.totalBytes
l := total - d.posInBytes l := total - d.posInBytes
if l > len(b) { if l > len(b) {
@ -119,12 +119,18 @@ func decode(in audio.ReadSeekCloser) (*decoded, int, int, error) {
return nil, 0, 0, err return nil, 0, 0, err
} }
d := &decoded{ d := &decoded{
data: []float32{}, data: make([]float32, 0, r.Length()),
totalBytes: int(r.Length()) * 4, // TODO: What if length is 0? totalBytes: int(r.Length()) * 4, // TODO: What if length is 0?
posInBytes: 0, posInBytes: 0,
source: in, source: in,
decoder: r, decoder: r,
} }
runtime.SetFinalizer(d, (*decoded).Close) runtime.SetFinalizer(d, (*decoded).Close)
if _, err := d.Read(make([]uint8, 65536)); err != nil {
return nil, 0, 0, err
}
if _, err := d.Seek(0, io.SeekStart); err != nil {
return nil, 0, 0, err
}
return d, r.Channels(), r.SampleRate(), nil return d, r.Channels(), r.SampleRate(), nil
} }