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

audio/vorbis: refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2024-07-21 15:22:11 +09:00
parent 1d260eac51
commit ef8afc6cf2
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
audio/vorbis/vorbis.go
View File

@ -61,8 +61,7 @@ func (s *Stream) SampleRate() int {
} }
type i16Stream struct { type i16Stream struct {
totalBytes int posInBytes int64
posInBytes int
vorbisReader *oggvorbis.Reader vorbisReader *oggvorbis.Reader
i16Reader io.Reader i16Reader io.Reader
} }
@ -72,9 +71,9 @@ func (s *i16Stream) Read(b []byte) (int, error) {
s.i16Reader = newInt16BytesReaderFromFloat32Reader(s.vorbisReader) s.i16Reader = newInt16BytesReaderFromFloat32Reader(s.vorbisReader)
} }
l := s.totalBytes - s.posInBytes l := s.totalBytes() - s.posInBytes
if l > len(b) { if l > int64(len(b)) {
l = len(b) l = int64(len(b))
} }
if l < 0 { if l < 0 {
return 0, io.EOF return 0, io.EOF
@ -90,8 +89,8 @@ retry:
goto retry goto retry
} }
s.posInBytes += n s.posInBytes += int64(n)
if s.posInBytes == s.totalBytes || err == io.EOF { if s.posInBytes == s.totalBytes() || err == io.EOF {
return n, io.EOF return n, io.EOF
} }
return n, nil return n, nil
@ -105,20 +104,21 @@ func (s *i16Stream) Seek(offset int64, whence int) (int64, error) {
case io.SeekCurrent: case io.SeekCurrent:
next = int64(s.posInBytes) + offset next = int64(s.posInBytes) + offset
case io.SeekEnd: case io.SeekEnd:
next = int64(s.totalBytes) + offset next = int64(s.totalBytes()) + offset
} }
// pos should be always even sampleSize := int64(s.vorbisReader.Channels()) * bitDepthInBytesInt16
next = next / 2 * 2 s.posInBytes = next / sampleSize * sampleSize
s.posInBytes = int(next) if err := s.vorbisReader.SetPosition(next / sampleSize); err != nil {
if err := s.vorbisReader.SetPosition(next / int64(s.vorbisReader.Channels()) / 2); err != nil {
return 0, err return 0, err
} }
s.i16Reader = nil s.i16Reader = nil
return next, nil return next, nil
} }
func (s *i16Stream) Length() int64 { func (s *i16Stream) totalBytes() int64 {
return int64(s.totalBytes) // TODO: r.Length() returns 0 when the format is unknown.
// Should we check that?
return s.vorbisReader.Length() * int64(s.vorbisReader.Channels()) * bitDepthInBytesInt16
} }
// decodeI16 accepts an ogg stream and returns a decorded stream. // decodeI16 accepts an ogg stream and returns a decorded stream.
@ -132,9 +132,6 @@ func decodeI16(in io.Reader) (*i16Stream, error) {
} }
s := &i16Stream{ s := &i16Stream{
// TODO: r.Length() returns 0 when the format is unknown.
// Should we check that?
totalBytes: int(r.Length()) * r.Channels() * 2, // 2 means 16bit per sample.
posInBytes: 0, posInBytes: 0,
vorbisReader: r, vorbisReader: r,
} }
@ -165,7 +162,7 @@ func DecodeWithoutResampling(src io.Reader) (*Stream, error) {
} }
var s io.ReadSeeker = i16Stream var s io.ReadSeeker = i16Stream
length := i16Stream.Length() length := i16Stream.totalBytes()
if i16Stream.vorbisReader.Channels() == 1 { if i16Stream.vorbisReader.Channels() == 1 {
s = convert.NewStereoI16(s, true, false) s = convert.NewStereoI16(s, true, false)
length *= 2 length *= 2
@ -199,7 +196,7 @@ func DecodeWithSampleRate(sampleRate int, src io.Reader) (*Stream, error) {
} }
var s io.ReadSeeker = i16Stream var s io.ReadSeeker = i16Stream
length := i16Stream.Length() length := i16Stream.totalBytes()
if i16Stream.vorbisReader.Channels() == 1 { if i16Stream.vorbisReader.Channels() == 1 {
s = convert.NewStereoI16(s, true, false) s = convert.NewStereoI16(s, true, false)
length *= 2 length *= 2