优化代码

main.go

@@ -60,7 +60,6 @@ func init() {
 	if plugin := InstallPlugin(config); plugin != nil {
 		plugin.HandleApi("/list", util.GetJsonHandler(getHDList, time.Second))
 		plugin.HandleFunc("/pull", func(rw http.ResponseWriter, r *http.Request) {
-			util.CORS(rw, r)
 			targetURL := r.URL.Query().Get("target")
 			streamPath := r.URL.Query().Get("streamPath")
 			save := r.URL.Query().Get("save")
@@ -111,7 +110,7 @@ func (config *HDLConfig) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		metaData := amf.Object{
-			"MetaDataCreator": "m7s",
+			"MetaDataCreator": "m7s" + Version,
 			"hasVideo":        vt != nil,
 			"hasAudio":        at != nil,
 			"hasMatadata":     true,

pull.go

@@ -1,6 +1,7 @@
 package hdl
 
 import (
+	"bufio"
 	"io"
 	"net/http"
 	"net/url"
@@ -11,45 +12,65 @@ import (
 	. "github.com/Monibuca/engine/v4"
 	"github.com/Monibuca/engine/v4/codec"
 	"github.com/Monibuca/engine/v4/track"
+	"github.com/Monibuca/engine/v4/util"
 )
 
 func (puller *HDLPuller) pull() {
-	head := make([]byte, len(codec.FLVHeader))
+	head := util.Buffer(make([]byte, len(codec.FLVHeader)))
-	io.ReadFull(puller, head)
+	reader := bufio.NewReader(puller)
-	startTime := time.Now()
+	_, err := io.ReadFull(reader, head)
-	for {
+	if err != nil {
-		if t, timestamp, payload, err := codec.ReadFLVTag(puller); err == nil {
+		return
+	}
+	head.Reset()
+	var startTime time.Time
+	var startTs uint32
+	defer puller.UnPublish()
+	for offsetTs := puller.absTS; err == nil; _, err = io.ReadFull(reader, head[:4]) {
+		tmp := head.SubBuf(0, 11)
+		_, err = io.ReadFull(reader, tmp)
+		if err != nil {
+			return
+		}
+		t := tmp.ReadByte()
+		dataSize := tmp.ReadUint24()
+		timestamp := tmp.ReadUint24() | uint32(tmp.ReadByte())<<24
+		tmp.ReadUint24()
+		payload := make([]byte, dataSize)
+		_, err = io.ReadFull(reader, payload)
+		if err != nil {
+			return
+		}
+		timestamp -= startTs // 相对时间戳
+		puller.absTS = offsetTs + timestamp
 		switch t {
 		case codec.FLV_TAG_TYPE_AUDIO:
-				puller.at.WriteAVCC(timestamp+puller.lastTs, payload)
+			puller.at.WriteAVCC(puller.absTS, payload)
 		case codec.FLV_TAG_TYPE_VIDEO:
-				puller.vt.WriteAVCC(timestamp+puller.lastTs, payload)
+			puller.vt.WriteAVCC(puller.absTS, payload)
 		}
 		if timestamp != 0 {
-				elapse := time.Since(startTime)
+			if startTs == 0 {
+				startTs = timestamp
+				startTime = time.Now()
+			} else if fast := time.Duration(timestamp)*time.Millisecond - time.Since(startTime); fast > 0 {
 				// 如果读取过快，导致时间戳超过真正流逝的时间，就需要睡眠，降低速度
-				if elapse.Milliseconds() < int64(timestamp) {
+				time.Sleep(fast)
-					time.Sleep(time.Millisecond*time.Duration(timestamp) - elapse)
 			}
 		}
-			puller.lastTs = timestamp
-		} else {
-			puller.UnPublish()
-			return
-		}
 	}
 }
 
 type HDLPuller struct {
 	Publisher
-	lastTs uint32 //断线前的时间戳
+	absTS uint32 //绝对时间戳
 	at    *track.UnknowAudio
 	vt    *track.UnknowVideo
 	io.ReadCloser
 }
 
 func (puller *HDLPuller) Close() {
-
+	puller.ReadCloser.Close()
 }
 
 func (puller *HDLPuller) OnStateChange(old StreamState, n StreamState) bool {
@@ -65,7 +86,6 @@ func (puller *HDLPuller) OnStateChange(old StreamState, n StreamState) bool {
 			}
 		} else {
 			if file, err := os.Open(puller.String()); err == nil {
-				file.Seek(int64(len(codec.FLVHeader)), io.SeekStart)
 				puller.ReadCloser = file
 			} else {
 				file.Close()
@@ -83,7 +103,6 @@ func (puller *HDLPuller) OnStateChange(old StreamState, n StreamState) bool {
 				}
 			} else {
 				if file, err := os.Open(puller.String()); err == nil {
-					file.Seek(int64(len(codec.FLVHeader)), io.SeekStart)
 					puller.ReadCloser = file
 				} else {
 					file.Close()