Merge d22f3dc929 into b6b1f4a437

format/rtsp/client.go

@@ -202,7 +202,7 @@ func (self *Client) SendRtpKeepalive() (err error) {
 				fmt.Println("rtp: keep alive")
 			}
 			req := Request{
-				Method: "OPTIONS",
+				Method: "GET_PARAMETER",
 				Uri:    self.requestUri,
 			}
 			if self.session != "" {

format/ts/muxer.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/deepch/vdk/codec/h265parser"
 	"io"
+	"sync"
 	"time"
 
 	"github.com/deepch/vdk/av"
@@ -15,9 +16,9 @@ import (
 var CodecTypes = []av.CodecType{av.H264, av.H265, av.AAC}
 
 type Muxer struct {
-	w       io.Writer
-	streams map[int]*Stream
-
+	w                        io.Writer
+	streams                  map[int]*Stream
+	mutex                    sync.Mutex
 	PaddingToMakeCounterCont bool
 
 	psidata []byte
@@ -64,6 +65,10 @@ func (self *Muxer) newStream(idx int, codec av.CodecData) (err error) {
 		pid:       pid,
 		tsw:       tsio.NewTSWriter(pid),
 	}
+
+	defer self.mutex.Unlock()
+	self.mutex.Lock()
+
 	self.streams[idx] = stream
 	return
 }