apps/plugin-rtsp
1
0
Fork 0
mirror of https://github.com/Monibuca/plugin-rtsp.git synced 2025-10-04 07:16:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修正升级带来的bug

Browse Source
This commit is contained in:
langhuihui
2020-06-09 07:09:25 +08:00
parent 53c4788df2
commit 93df7632a6
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
session.go
View File

@@ -317,6 +317,7 @@ func (session *RTSP) handleRequest(req *Request) {
session.SDPRaw = req.Body session.SDPRaw = req.Body
session.SDPMap = ParseSDP(req.Body) session.SDPMap = ParseSDP(req.Body)
if session.Publish(streamPath) {
sdp, ok := session.SDPMap["audio"] sdp, ok := session.SDPMap["audio"]
if ok { if ok {
session.AControl = sdp.Control session.AControl = sdp.Control
@@ -331,7 +332,6 @@ func (session *RTSP) handleRequest(req *Request) {
session.WritePPS(sdp.SpropParameterSets[1]) session.WritePPS(sdp.SpropParameterSets[1])
Printf("video codec[%s]\n", session.VCodec) Printf("video codec[%s]\n", session.VCodec)
} }
if session.Publish(streamPath) {
session.Stream.Type = "RTSP" session.Stream.Type = "RTSP"
session.RTSPInfo.StreamInfo = &session.Stream.StreamInfo session.RTSPInfo.StreamInfo = &session.Stream.StreamInfo
collection.Store(streamPath, session) collection.Store(streamPath, session)

13
udp-server.go
View File

@@ -2,13 +2,14 @@ package rtsp
import ( import (
"fmt" "fmt"
. "github.com/Monibuca/engine/v2"
. "github.com/Monibuca/plugin-rtp"
"net" "net"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
"time" "time"
. "github.com/Monibuca/engine/v2"
. "github.com/Monibuca/plugin-rtp"
) )
type UDPServer struct { type UDPServer struct {
@@ -94,7 +95,7 @@ func (s *UDPServer) SetupAudio() (err error) {
pack := &RTPPack{ pack := &RTPPack{
Type: RTP_TYPE_AUDIO, Type: RTP_TYPE_AUDIO,
} }
pack.Unmarshal(bufUDP) pack.Unmarshal(bufUDP[:n])
s.HandleRTP(pack) s.HandleRTP(pack)
} else { } else {
Println("udp server read audio pack error", err) Println("udp server read audio pack error", err)
@@ -133,7 +134,7 @@ func (s *UDPServer) SetupAudio() (err error) {
pack := &RTPPack{ pack := &RTPPack{
Type: RTP_TYPE_AUDIOCONTROL, Type: RTP_TYPE_AUDIOCONTROL,
} }
pack.Unmarshal(bufUDP) pack.Unmarshal(bufUDP[:n])
s.HandleRTP(pack) s.HandleRTP(pack)
} else { } else {
Println("udp server read audio control pack error", err) Println("udp server read audio control pack error", err)
@@ -182,7 +183,7 @@ func (s *UDPServer) SetupVideo() (err error) {
pack := &RTPPack{ pack := &RTPPack{
Type: RTP_TYPE_VIDEO, Type: RTP_TYPE_VIDEO,
} }
pack.Unmarshal(bufUDP) pack.Unmarshal(bufUDP[:n])
s.HandleRTP(pack) s.HandleRTP(pack)
} else { } else {
Println("udp server read video pack error", err) Println("udp server read video pack error", err)
@@ -222,7 +223,7 @@ func (s *UDPServer) SetupVideo() (err error) {
pack := &RTPPack{ pack := &RTPPack{
Type: RTP_TYPE_VIDEOCONTROL, Type: RTP_TYPE_VIDEOCONTROL,
} }
pack.Unmarshal(bufUDP) pack.Unmarshal(bufUDP[:n])
s.HandleRTP(pack) s.HandleRTP(pack)
} else { } else {
Println("udp server read video control pack error", err) Println("udp server read video control pack error", err)