zishuo/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-12-24 13:08:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

audio/internal/convert: rename StereoI16 -> StereoI16ReadSeeker

Browse Source
This commit is contained in:
Hajime Hoshi
2025-04-03 12:27:12 +09:00
parent 158bf2bacd
commit e2fdaa45e7
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
audio/internal/convert/stereoi16.go
View File

@@ -26,22 +26,22 @@ const (
FormatS24
)
type StereoI16 struct {
type StereoI16ReadSeeker struct {
source io.ReadSeeker
mono bool
format Format
buf []byte
}
func NewStereoI16(source io.ReadSeeker, mono bool, format Format) *StereoI16 {
return &StereoI16{
func NewStereoI16ReadSeeker(source io.ReadSeeker, mono bool, format Format) *StereoI16ReadSeeker {
return &StereoI16ReadSeeker{
source: source,
mono: mono,
format: format,
}
}
func (s *StereoI16) Read(b []byte) (int, error) {
func (s *StereoI16ReadSeeker) Read(b []byte) (int, error) {
l := len(b) / 4 * 4
if s.mono {
l /= 2
@@ -124,7 +124,7 @@ func (s *StereoI16) Read(b []byte) (int, error) {
return n, err
}
func (s *StereoI16) Seek(offset int64, whence int) (int64, error) {
func (s *StereoI16ReadSeeker) Seek(offset int64, whence int) (int64, error) {
offset = offset / 4 * 4
if s.mono {
offset /= 2

6
audio/internal/convert/stereoi16_test.go
View File

@@ -64,7 +64,7 @@ func TestStereoI16FromSigned16Bits(t *testing.T) {
outBytes = append(outBytes, byte(v), byte(v>>8))
}
}
s := convert.NewStereoI16(bytes.NewReader(inBytes), mono, convert.FormatS16)
s := convert.NewStereoI16ReadSeeker(bytes.NewReader(inBytes), mono, convert.FormatS16)
var got []byte
for {
var buf [97]byte
@@ -145,7 +145,7 @@ func TestStereoI16FromUnsigned8Bits(t *testing.T) {
outBytes = append(outBytes, byte(v16), byte(v16>>8))
}
}
s := convert.NewStereoI16(bytes.NewReader(inBytes), mono, convert.FormatU8)
s := convert.NewStereoI16ReadSeeker(bytes.NewReader(inBytes), mono, convert.FormatU8)
var got []byte
for {
var buf [97]byte
@@ -225,7 +225,7 @@ func TestStereoI16FromSigned24Bits(t *testing.T) {
outBytes = append(outBytes, byte(v>>8), byte(v>>16))
}
}
s := convert.NewStereoI16(bytes.NewReader(inBytes), mono, convert.FormatS24)
s := convert.NewStereoI16ReadSeeker(bytes.NewReader(inBytes), mono, convert.FormatS24)
var got []byte
for {
var buf [97]byte

4
audio/vorbis/vorbis.go
View File

@@ -204,7 +204,7 @@ func DecodeWithoutResampling(src io.Reader) (*Stream, error) {
var s io.ReadSeeker = i16Stream
length := i16Stream.totalBytes()
if i16Stream.vorbisReader.Channels() == 1 {
s = convert.NewStereoI16(s, true, convert.FormatS16)
s = convert.NewStereoI16ReadSeeker(s, true, convert.FormatS16)
length *= 2
}
@@ -238,7 +238,7 @@ func DecodeWithSampleRate(sampleRate int, src io.Reader) (*Stream, error) {
var s io.ReadSeeker = i16Stream
length := i16Stream.totalBytes()
if i16Stream.vorbisReader.Channels() == 1 {
s = convert.NewStereoI16(s, true, convert.FormatS16)
s = convert.NewStereoI16ReadSeeker(s, true, convert.FormatS16)
length *= 2
}
if i16Stream.vorbisReader.SampleRate() != sampleRate {

2
audio/wav/decode.go
View File

@@ -233,7 +233,7 @@ chunks:
// TODO: Support signed 24bit integer format (#2215).
return nil, fmt.Errorf("wav: unsupported bits per sample: %d", bitsPerSample)
}
s = convert.NewStereoI16(s, mono, format)
s = convert.NewStereoI16ReadSeeker(s, mono, format)
if mono {
dataSize *= 2
}