mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-11 19:48:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio/mp3: Remove global variable 'writer'

Browse Source
This commit is contained in:
Hajime Hoshi 2017-06-18 00:02:51 +09:00
parent 19b3df1da3
commit 9890a530a2
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
audio/mp3/decode_notjs.go
View File

@ -26,7 +26,6 @@ var (
readerCache []uint8 readerCache []uint8
readerPos int readerPos int
readerEOF bool readerEOF bool
writer io.Writer
) )
func (f *frame) numberOfChannels() int { func (f *frame) numberOfChannels() int {
@ -36,7 +35,8 @@ func (f *frame) numberOfChannels() int {
return 2 return 2
} }
func (f *frame) decodeL3() error { func (f *frame) decodeL3() []uint8 {
out := make([]uint8, 576*4*2)
nch := f.numberOfChannels() nch := f.numberOfChannels()
for gr := 0; gr < 2; gr++ { for gr := 0; gr < 2; gr++ {
for ch := 0; ch < nch; ch++ { for ch := 0; ch < nch; ch++ {
@ -45,20 +45,16 @@ func (f *frame) decodeL3() error {
f.l3Reorder(gr, ch) f.l3Reorder(gr, ch)
} }
f.l3Stereo(gr) f.l3Stereo(gr)
out := make([]uint8, 576*4)
for ch := 0; ch < nch; ch++ { for ch := 0; ch < nch; ch++ {
f.l3Antialias(gr, ch) f.l3Antialias(gr, ch)
// (IMDCT,windowing,overlapp add) // (IMDCT,windowing,overlapp add)
f.l3HybridSynthesis(gr, ch) f.l3HybridSynthesis(gr, ch)
f.l3FrequencyInversion(gr, ch) f.l3FrequencyInversion(gr, ch)
// Polyphase subband synthesis // Polyphase subband synthesis
f.l3SubbandSynthesis(gr, ch, out) f.l3SubbandSynthesis(gr, ch, out[576*4*gr:])
}
if _, err := writer.Write(out); err != nil {
return err
} }
} }
return nil return out
} }
func getByte() (uint8, error) { func getByte() (uint8, error) {
@ -102,11 +98,11 @@ var eof = errors.New("mp3: expected EOF")
func decode(r io.Reader, w io.Writer) error { func decode(r io.Reader, w io.Writer) error {
reader = r reader = r
writer = w
for { for {
f, err := readFrame() f, err := readFrame()
if err == nil { if err == nil {
if err := f.decodeL3(); err != nil { out := f.decodeL3()
if _, err := w.Write(out); err != nil {
return err return err
} }
continue continue