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

change Streams()

Browse Source
This commit is contained in:
nareix 2016-06-12 08:53:06 +08:00
parent a09ee38028
commit c437a98c93
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
av.go
View File

@ -140,7 +140,7 @@ type Muxer interface {
type Demuxer interface { type Demuxer interface {
ReadPacket() (int, Packet, error) ReadPacket() (int, Packet, error)
Streams() []CodecData Streams() ([]CodecData, error)
} }
type Packet struct { type Packet struct {

21
transcode/transcode.go
View File

@ -45,7 +45,10 @@ func (self *Transcoder) Setup(streams []av.CodecData) (err error) {
} }
self.queue = &pktreorder.Queue{} self.queue = &pktreorder.Queue{}
self.queue.Alloc(self.Streams())
var newstreams []av.CodecData
newstreams, _ = self.Streams()
self.queue.Alloc(newstreams)
return return
} }
@ -105,7 +108,7 @@ func (self *Transcoder) ReadPacket() (i int, pkt av.Packet, err error) {
return self.queue.ReadPacket() return self.queue.ReadPacket()
} }
func (self *Transcoder) Streams() (streams []av.CodecData) { func (self *Transcoder) Streams() (streams []av.CodecData, err error) {
for _, stream := range self.streams { for _, stream := range self.streams {
streams = append(streams, stream.CodecData) streams = append(streams, stream.CodecData)
} }
@ -133,7 +136,11 @@ func (self *Muxer) WriteHeader(streams []av.CodecData) (err error) {
if err = self.Transcoder.Setup(streams); err != nil { if err = self.Transcoder.Setup(streams); err != nil {
return return
} }
if err = self.Muxer.WriteHeader(self.Transcoder.Streams()); err != nil { var newstreams []av.CodecData
if newstreams, err = self.Transcoder.Streams(); err != nil {
return
}
if err = self.Muxer.WriteHeader(newstreams); err != nil {
return return
} }
return return
@ -178,7 +185,11 @@ type Demuxer struct {
} }
func (self *Demuxer) Setup() (err error) { func (self *Demuxer) Setup() (err error) {
if err = self.Transcoder.Setup(self.Demuxer.Streams()); err != nil { var streams []av.CodecData
if streams, err = self.Demuxer.Streams(); err != nil {
return
}
if err = self.Transcoder.Setup(streams); err != nil {
return return
} }
return return
@ -201,7 +212,7 @@ func (self *Demuxer) ReadPacket() (i int, pkt av.Packet, err error) {
} }
} }
func (self *Demuxer) Streams() []av.CodecData { func (self *Demuxer) Streams() ([]av.CodecData, error) {
return self.Transcoder.Streams() return self.Transcoder.Streams()
} }