mirror of https://bitbucket.org/ausocean/av.git
av/stream/flac: using writerseeker to pass to wav.NewEncoder because I don't want to give it a file, but it's not working
This commit is contained in:
parent
44c79e2256
commit
6fda0b3c3f
|
@ -4,66 +4,16 @@ import (
|
|||
"bytes"
|
||||
"errors"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
|
||||
"github.com/go-audio/audio"
|
||||
"github.com/go-audio/wav"
|
||||
"github.com/mewkiz/flac"
|
||||
"github.com/orcaman/writerseeker"
|
||||
)
|
||||
|
||||
const wavAudioFormat = 1
|
||||
|
||||
type buffer struct {
|
||||
Buffer bytes.Buffer
|
||||
Index int64
|
||||
}
|
||||
|
||||
func (b *buffer) Bytes() []byte {
|
||||
return b.Buffer.Bytes()
|
||||
}
|
||||
|
||||
func (b *buffer) Read(p []byte) (int, error) {
|
||||
n, err := bytes.NewBuffer(b.Buffer.Bytes()[b.Index:]).Read(p)
|
||||
|
||||
if err == nil {
|
||||
if b.Index+int64(len(p)) < int64(b.Buffer.Len()) {
|
||||
b.Index += int64(len(p))
|
||||
} else {
|
||||
b.Index = int64(b.Buffer.Len())
|
||||
}
|
||||
}
|
||||
|
||||
return n, err
|
||||
}
|
||||
|
||||
func (b *buffer) Write(p []byte) (int, error) {
|
||||
n, err := b.Buffer.Write(p)
|
||||
|
||||
if err == nil {
|
||||
b.Index = int64(b.Buffer.Len())
|
||||
}
|
||||
|
||||
return n, err
|
||||
}
|
||||
|
||||
func (b *buffer) Seek(offset int64, whence int) (int64, error) {
|
||||
var err error
|
||||
var Index int64 = 0
|
||||
|
||||
switch whence {
|
||||
case 0:
|
||||
if offset >= int64(b.Buffer.Len()) || offset < 0 {
|
||||
err = errors.New("Invalid Offset.")
|
||||
} else {
|
||||
b.Index = offset
|
||||
Index = offset
|
||||
}
|
||||
default:
|
||||
err = errors.New("Unsupported Seek Method.")
|
||||
}
|
||||
|
||||
return Index, err
|
||||
}
|
||||
|
||||
// Decode takes a slice of flac and decodes to wav
|
||||
func Decode(buf []byte) ([]byte, error) {
|
||||
r := bytes.NewReader(buf)
|
||||
|
@ -71,10 +21,12 @@ func Decode(buf []byte) ([]byte, error) {
|
|||
if err != nil {
|
||||
return nil, errors.New("Could not parse FLAC")
|
||||
}
|
||||
fb := &buffer{}
|
||||
enc := wav.NewEncoder(fb, int(stream.Info.SampleRate), int(stream.Info.BitsPerSample), int(stream.Info.NChannels), wavAudioFormat)
|
||||
ws := &writerseeker.WriterSeeker{}
|
||||
enc := wav.NewEncoder(ws, int(stream.Info.SampleRate), int(stream.Info.BitsPerSample), int(stream.Info.NChannels), wavAudioFormat)
|
||||
defer enc.Close()
|
||||
var data []int
|
||||
var out []byte
|
||||
var d []byte
|
||||
for {
|
||||
// Decode FLAC audio samples.
|
||||
frame, err := stream.ParseNext()
|
||||
|
@ -103,6 +55,12 @@ func Decode(buf []byte) ([]byte, error) {
|
|||
if err := enc.Write(buf); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
d, err = ioutil.ReadAll(ws.Reader())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return fb.Bytes(), nil
|
||||
out = append(out, d...)
|
||||
}
|
||||
|
||||
return d, nil
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ import (
|
|||
|
||||
const (
|
||||
testFile = "/home/saxon/Desktop/robot.flac"
|
||||
outFile = "out.wav"
|
||||
outFile = "testOut.wav"
|
||||
)
|
||||
|
||||
func TestDecodeFlac(t *testing.T) {
|
||||
|
|
Loading…
Reference in New Issue