thefoxon/joy4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ReadHeader() -> Streams()

Browse Source
This commit is contained in:
nareix 2016-06-30 22:55:20 +08:00
parent 3278c29b62
commit ceb78810e2
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
flv.go
View File

@ -24,14 +24,6 @@ func NewMuxer(w io.Writer) *Muxer {
return self return self
} }
func Create(w io.Writer, streams []av.CodecData) (muxer *Muxer, err error) {
muxer = NewMuxer(w)
if err = muxer.WriteHeader(streams); err != nil {
return
}
return
}
func (self *Muxer) WriteHeader(streams []av.CodecData) (err error) { func (self *Muxer) WriteHeader(streams []av.CodecData) (err error) {
var flags uint8 var flags uint8
for _, stream := range streams { for _, stream := range streams {
@ -126,14 +118,7 @@ type Demuxer struct {
audiostreamidx int audiostreamidx int
pr *pio.Reader pr *pio.Reader
probepkts []flvio.Tag probepkts []flvio.Tag
} probed bool
func Open(r io.Reader) (demuxer *Demuxer, err error) {
demuxer = NewDemuxer(r)
if err = demuxer.ReadHeader(); err != nil {
return
}
return
} }
func NewDemuxer(r io.Reader) *Demuxer { func NewDemuxer(r io.Reader) *Demuxer {
@ -142,7 +127,11 @@ func NewDemuxer(r io.Reader) *Demuxer {
} }
} }
func (self *Demuxer) ReadHeader() (err error) { func (self *Demuxer) probe() (err error) {
if self.probed {
return
}
var flags, got uint8 var flags, got uint8
if flags, err = flvio.ReadFileHeader(self.pr); err != nil { if flags, err = flvio.ReadFileHeader(self.pr); err != nil {
return return
@ -208,10 +197,14 @@ func (self *Demuxer) ReadHeader() (err error) {
} }
} }
self.probed = true
return return
} }
func (self *Demuxer) Streams() (streams []av.CodecData, err error) { func (self *Demuxer) Streams() (streams []av.CodecData, err error) {
if err = self.probe(); err != nil {
return
}
for _, stream := range self.streams { for _, stream := range self.streams {
streams = append(streams, stream.CodecData) streams = append(streams, stream.CodecData)
} }
@ -227,6 +220,10 @@ func timeToTs(tm time.Duration) int32 {
} }
func (self *Demuxer) ReadPacket() (pkt av.Packet, err error) { func (self *Demuxer) ReadPacket() (pkt av.Packet, err error) {
if err = self.probe(); err != nil {
return
}
var timestamp int32 var timestamp int32
var stream *flvStream var stream *flvStream