修复一个低级错误

Merge pull request #13 from lhong1001/rtsp-syld
modified by syld 2021-12-20
2025-10-01 14:02:22 +08:00 · 2021-12-22 16:32:06 +08:00 · 2021-12-20 18:24:49 +08:00 · 2021-12-20 17:43:08 +08:00
2 changed files with 4 additions and 3 deletions
--- a/client.go
+++ b/client.go
@@ -103,7 +103,7 @@ func (rtsp *RTSPClient) PushStream(streamPath string, rtspUrl string) (err error
 			trackId := trackIds
 			switch sub.at.CodecID {
 			case codec.CodecID_PCMA, codec.CodecID_PCMU:
-				atrack := NewG711Track(97, map[byte]string{7: "pcma", 8: "pcmu"}[sub.vt.CodecID])
+				atrack := NewG711Track(97, map[byte]string{7: "pcma", 8: "pcmu"}[sub.at.CodecID])
 				apacketizer := rtp.NewPacketizer(1200, 97, uint32(ssrc), &codecs.G711Payloader{}, rtp.NewFixedSequencer(1), 8000)
 				sub.OnAudio = func(ts uint32, pack *AudioPack) {
 					for _, pack := range apacketizer.Packetize(pack.Raw, (ts-st)*8) {
@@ -150,7 +150,6 @@ func (client *RTSPClient) pullStream() {
 		},
 		Transport: &client.Transport,
 	}
-	defer client.Client.Close()
 	// parse URL
 	u, err := base.ParseURL(client.URL)
 	if err != nil {
@@ -162,6 +161,8 @@ func (client *RTSPClient) pullStream() {
 		Printf("connect:%s error:%v", client.URL, err)
 		return
 	}
+	//client.close should be after connected!
+	defer client.Client.Close()
 	var res *base.Response
 	if res, err = client.Options(u); err != nil {
 		Printf("option:%s error:%v", client.URL, err)
--- a/server.go
+++ b/server.go
@@ -119,7 +119,7 @@ func (sh *RTSPServer) OnDescribe(ctx *gortsplib.ServerHandlerOnDescribeCtx) (*ba
 			trackId := trackIds
 			switch sub.at.CodecID {
 			case codec.CodecID_PCMA, codec.CodecID_PCMU:
-				atrack := NewG711Track(97, map[byte]string{7: "pcma", 8: "pcmu"}[sub.vt.CodecID])
+				atrack := NewG711Track(97, map[byte]string{7: "pcma", 8: "pcmu"}[sub.at.CodecID])
 				apacketizer := rtp.NewPacketizer(1200, 97, uint32(ssrc), &codecs.G711Payloader{}, rtp.NewFixedSequencer(1), 8000)
 				sub.OnAudio = func(ts uint32, pack *engine.AudioPack) {
 					for _, pack := range apacketizer.Packetize(pack.Raw, (ts-st)*8) {
Author	SHA1	Message	Date
dexter	bed7ba8a87	修复一个低级错误	2021-12-22 16:32:06 +08:00
dexter	0cbc4beb0f	Merge pull request #13 from lhong1001/rtsp-syld modified by syld 2021-12-20	2021-12-20 18:24:49 +08:00
root	edbfc07275	modified by syld 2021-12-20	2021-12-20 17:43:08 +08:00