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

change avutil.Create / avutil.Open params

Browse Source
This commit is contained in:
nareix 2016-07-03 17:39:04 +08:00
parent 9cac7971c4
commit 25869d4bbc
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
av/avutil/avutil.go
View File

@ -85,16 +85,6 @@ func (self *Handlers) createUrl(u *url.URL, uri string) (w io.WriteCloser, err e
} }
func (self *Handlers) Open(uri string) (demuxer av.DemuxCloser, err error) { func (self *Handlers) Open(uri string) (demuxer av.DemuxCloser, err error) {
if demuxer, err = self.OpenDemuxer(uri); err != nil {
return
}
if _, err = demuxer.Streams(); err != nil {
return
}
return
}
func (self *Handlers) OpenDemuxer(uri string) (demuxer av.DemuxCloser, err error) {
for _, handler := range self.handlers { for _, handler := range self.handlers {
if handler.UrlDemuxer != nil { if handler.UrlDemuxer != nil {
var ok bool var ok bool
@ -153,7 +143,7 @@ func (self *Handlers) OpenDemuxer(uri string) (demuxer av.DemuxCloser, err error
return return
} }
func (self *Handlers) CreateMuxer(uri string) (muxer av.MuxCloser, err error) { func (self *Handlers) Create(uri string) (muxer av.MuxCloser, err error) {
var ext string var ext string
var u *url.URL var u *url.URL
if u, _ = url.Parse(uri); u != nil && u.Scheme != "" { if u, _ = url.Parse(uri); u != nil && u.Scheme != "" {
@ -182,16 +172,6 @@ func (self *Handlers) CreateMuxer(uri string) (muxer av.MuxCloser, err error) {
return return
} }
func (self *Handlers) Create(uri string, streams []av.CodecData) (muxer av.MuxCloser, err error) {
if muxer, err = self.CreateMuxer(uri); err != nil {
return
}
if err = muxer.WriteHeader(streams); err != nil {
return
}
return
}
var DefaultHandlers = &Handlers{} var DefaultHandlers = &Handlers{}
func AddHandler(fn func(*RegisterHandler)) { func AddHandler(fn func(*RegisterHandler)) {
@ -202,7 +182,7 @@ func Open(url string) (demuxer av.DemuxCloser, err error) {
return DefaultHandlers.Open(url) return DefaultHandlers.Open(url)
} }
func Create(url string, streams []av.CodecData) (muxer av.MuxCloser, err error) { func Create(url string) (muxer av.MuxCloser, err error) {
return DefaultHandlers.Create(url, streams) return DefaultHandlers.Create(url)
} }