apps/plugin-webrtc
1
0
Fork 0
mirror of https://github.com/Monibuca/plugin-webrtc.git synced 2025-10-05 23:06:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

等待列表加锁处理

Browse Source
This commit is contained in:
langhuihui
2020-07-07 21:28:53 +08:00
parent a4ce3e4008
commit f1cea12e92
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
main.go
View File

@@ -53,8 +53,27 @@ var api *API
var SSRC uint32 var SSRC uint32
var SSRCMap = make(map[string]uint32) var SSRCMap = make(map[string]uint32)
var ssrcLock sync.Mutex var ssrcLock sync.Mutex
var playWaitList sync.Map var playWaitList WaitList
type WaitList struct {
m map[string]*WebRTC
l sync.Mutex
}
func (wl *WaitList) Set(k string, v *WebRTC) {
wl.l.Lock()
defer wl.l.Unlock()
if wl.m == nil {
wl.m = make(map[string]*WebRTC)
}
wl.m[k] = v
}
func (wl *WaitList) Get(k string) *WebRTC {
wl.l.Lock()
defer wl.l.Unlock()
defer delete(wl.m, k)
return wl.m[k]
}
func init() { func init() {
m.RegisterCodec(NewRTPCodec(RTPCodecTypeVideo, m.RegisterCodec(NewRTPCodec(RTPCodecTypeVideo,
H264, H264,
@@ -210,6 +229,7 @@ func (rtc *WebRTC) GetAnswer(localSdp SessionDescription) ([]byte, error) {
return bytes, nil return bytes, nil
} }
} }
func run() { func run() {
http.HandleFunc("/webrtc/play", func(w http.ResponseWriter, r *http.Request) { http.HandleFunc("/webrtc/play", func(w http.ResponseWriter, r *http.Request) {
streamPath := r.URL.Query().Get("streamPath") streamPath := r.URL.Query().Get("streamPath")
@@ -220,8 +240,7 @@ func run() {
Println(err) Println(err)
return return
} }
if value, ok := playWaitList.Load(streamPath); ok { if rtc := playWaitList.Get(streamPath); rtc != nil {
rtc := value.(*WebRTC)
if err := rtc.SetRemoteDescription(offer); err != nil { if err := rtc.SetRemoteDescription(offer); err != nil {
Println(err) Println(err)
return return
@@ -273,7 +292,7 @@ func run() {
return return
} }
rtc.videoTrack = videoTrack rtc.videoTrack = videoTrack
playWaitList.Store(streamPath, rtc) playWaitList.Set(streamPath, rtc)
rtc.RemoteAddr = r.RemoteAddr rtc.RemoteAddr = r.RemoteAddr
offer, err := rtc.CreateOffer(nil) offer, err := rtc.CreateOffer(nil)
if err != nil { if err != nil {