add rtmp UrlMuxer

av/avconv/avconv.go

@@ -6,6 +6,7 @@ import (
 	"time"
 	"github.com/nareix/joy4/av/avutil"
 	"github.com/nareix/joy4/av"
+	"github.com/nareix/joy4/av/pktque"
 	"github.com/nareix/joy4/av/transcode"
 )
 
@@ -123,6 +124,7 @@ func ConvertCmdline(args []string) (err error) {
 	flagi := false
 	flagv := false
 	flagt := false
+	flagre := false
 	duration := time.Duration(0)
 	options := Options{}
 
@@ -137,6 +139,9 @@ func ConvertCmdline(args []string) (err error) {
 		case "-t":
 			flagt = true
 
+		case "-re":
+			flagre = true
+
 		default:
 			switch {
 			case flagi:
@@ -212,9 +217,18 @@ func ConvertCmdline(args []string) (err error) {
 		return
 	}
 
+	filters := pktque.Filters{}
+	if flagre {
+		filters = append(filters, &pktque.Walltime{})
+	}
+	filterdemux := &pktque.FilterDemuxer{
+		Demuxer: convdemux,
+		Filter: filters,
+	}
+
 	for {
 		var pkt av.Packet
-		if pkt, err = convdemux.ReadPacket(); err != nil {
+		if pkt, err = filterdemux.ReadPacket(); err != nil {
 			if err == io.EOF {
 				err = nil
 				break

av/avutil/avutil.go

@@ -57,6 +57,7 @@ type RegisterHandler struct {
 	Ext string
 	ReaderDemuxer func(io.Reader)av.Demuxer
 	WriterMuxer func(io.Writer)av.Muxer
+	UrlMuxer func(string)(bool,av.MuxCloser,error)
 	UrlDemuxer func(string)(bool,av.DemuxCloser,error)
 	UrlReader func(string)(bool,io.ReadCloser,error)
 	Probe func([]byte)bool
@@ -226,6 +227,13 @@ func (self *Handlers) FindCreate(uri string) (handler RegisterHandler, muxer av.
 					return
 				}
 			}
+		} else {
+			if handler.UrlMuxer != nil {
+				var ok bool
+				if ok, muxer, err = handler.UrlMuxer(uri); ok {
+					return
+				}
+			}
 		}
 	}
 

format/rtmp/rtmp.go

@@ -1594,6 +1594,15 @@ func Handler(h *avutil.RegisterHandler) {
 		return
 	}
 
+	h.UrlMuxer = func(uri string) (ok bool, muxer av.MuxCloser, err error) {
+		if !strings.HasPrefix(uri, "rtmp://") {
+			return
+		}
+		ok = true
+		muxer, err = Dial(uri)
+		return
+	}
+
 	h.ServerMuxer = func(uri string) (ok bool, muxer av.MuxCloser, err error) {
 		if !strings.HasPrefix(uri, "rtmp://") {
 			return