diff --git a/demuxer.go b/demuxer.go index 4eda814..08b1d37 100644 --- a/demuxer.go +++ b/demuxer.go @@ -11,15 +11,6 @@ import ( "io" ) -func Open(R io.Reader) (demuxer *Demuxer, err error) { - _demuxer := &Demuxer{R: R} - if err = _demuxer.ReadHeader(); err != nil { - return - } - demuxer = _demuxer - return -} - type Demuxer struct { R io.Reader diff --git a/handler.go b/handler.go new file mode 100644 index 0000000..d940a48 --- /dev/null +++ b/handler.go @@ -0,0 +1,18 @@ +package ts + +import ( + "io" + "github.com/nareix/av" + "github.com/nareix/av/avutil" +) + +func Handler(h *avutil.RegisterHandler) { + h.Ext = ".ts" + h.ReaderDemuxer = func(r io.Reader) av.Demuxer { + return &Demuxer{R: r} + } + h.WriterMuxer = func(w io.Writer) av.Muxer { + return &Muxer{W: w} + } +} + diff --git a/muxer.go b/muxer.go index 7ab44e4..3a087b7 100644 --- a/muxer.go +++ b/muxer.go @@ -9,15 +9,6 @@ import ( "io" ) -func Create(W io.Writer, streams []av.CodecData) (muxer *Muxer, err error) { - _muxer := &Muxer{W: W} - if err = _muxer.WriteHeader(streams); err != nil { - return - } - muxer = _muxer - return -} - type Muxer struct { W io.Writer streams []*Stream @@ -139,7 +130,7 @@ func (self *Muxer) WriteHeader(streams []av.CodecData) (err error) { } func (self *Muxer) WritePacket(pkt av.Packet) (err error) { - if true { + if false { fmt.Println("ts:", "in", pkt.Idx, pkt.Time, "len", len(pkt.Data)) } if err = self.writePacket(pkt); err != nil {