apps/plugin-webrtc
1
0
Fork 0
mirror of https://github.com/Monibuca/plugin-webrtc.git synced 2025-10-21 13:59:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: single pc subscribe

Browse Source
This commit is contained in:
langhuihui
2023-07-10 18:58:52 +08:00
parent aa42ec6284
commit 261851f7f7
2 changed files with 174 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
batcher.go
View File

@@ -5,6 +5,7 @@ import (
. "github.com/pion/webrtc/v3"
"go.uber.org/zap"
"m7s.live/engine/v4/codec"
)
type Signal struct {
@@ -15,6 +16,34 @@ type Signal struct {
StreamPath string `json:"streamPath"`
}
type SignalStreamPath struct {
Type string `json:"type"`
StreamPath string `json:"streamPath"`
}
func NewRemoveSingal(streamPath string) string {
s := SignalStreamPath{
Type: "remove",
StreamPath: streamPath,
}
b, _ := json.Marshal(s)
return string(b)
}
type SignalSDP struct {
Type string `json:"type"`
SDP string `json:"sdp"`
}
func NewAnswerSingal(sdp string) string {
s := SignalSDP{
Type: "answer",
SDP: sdp,
}
b, _ := json.Marshal(s)
return string(b)
}
type WebRTCBatcher struct {
PageSize int
PageNum int
@@ -55,9 +84,22 @@ func (suber *WebRTCBatcher) Start() (err error) {
return
}
func (suber *WebRTCBatcher) RemoveSubscribe(streamPath string) {
suber.signalChannel.SendText(NewRemoveSingal(streamPath))
}
func (suber *WebRTCBatcher) Answer() (err error) {
var answer string
if answer, err = suber.GetAnswer(); err == nil {
err = suber.signalChannel.SendText(NewAnswerSingal(answer))
}
if err != nil {
WebRTCPlugin.Error("Signal GetAnswer", zap.Error(err))
}
return
}
func (suber *WebRTCBatcher) Signal(msg DataChannelMessage) {
var s Signal
var removeMap = map[string]string{"type": "remove", "streamPath": ""}
// var offer SessionDescription
if err := json.Unmarshal(msg.Data, &s); err != nil {
WebRTCPlugin.Error("Signal", zap.Error(err))
@@ -74,36 +116,32 @@ func (suber *WebRTCBatcher) Signal(msg DataChannelMessage) {
if err = WebRTCPlugin.SubscribeExist(streamPath, sub); err == nil {
suber.subscribers = append(suber.subscribers, sub)
go func(streamPath string) {
sub.PlayRTP()
if sub.audio.RTPSender != nil {
suber.RemoveTrack(sub.audio.RTPSender )
if sub.DC == nil {
sub.PlayRTP()
if sub.audio.RTPSender != nil {
suber.RemoveTrack(sub.audio.RTPSender)
}
if sub.video.RTPSender != nil {
suber.RemoveTrack(sub.video.RTPSender)
}
suber.RemoveSubscribe(streamPath)
} else {
sub.DC.OnOpen(func() {
sub.DC.Send(codec.FLVHeader)
go func() {
sub.PlayFLV()
sub.DC.Close()
suber.RemoveSubscribe(streamPath)
}()
})
}
if sub.video.RTPSender != nil {
suber.RemoveTrack(sub.video.RTPSender)
}
if sub.DC != nil {
sub.DC.Close()
}
removeMap["streamPath"] = streamPath
b, _ := json.Marshal(removeMap)
suber.signalChannel.SendText(string(b))
}(streamPath)
} else {
removeMap["streamPath"] = streamPath
b, _ := json.Marshal(removeMap)
suber.signalChannel.SendText(string(b))
WebRTCPlugin.Error("subscribe", zap.String("streamPath", streamPath), zap.Error(err))
suber.RemoveSubscribe(streamPath)
}
}
var answer string
if answer, err = suber.GetAnswer(); err == nil {
b, _ := json.Marshal(map[string]string{"type": "answer", "sdp": answer})
err = suber.signalChannel.SendText(string(b))
}
if err != nil {
WebRTCPlugin.Error("Signal GetAnswer", zap.Error(err))
return
}
err = suber.Answer()
// if offer, err = suber.CreateOffer(nil); err == nil {
// b, _ := json.Marshal(offer)
// err = suber.signalChannel.SendText(string(b))
@@ -114,20 +152,13 @@ func (suber *WebRTCBatcher) Signal(msg DataChannelMessage) {
WebRTCPlugin.Error("Signal SetRemoteDescription", zap.Error(err))
return
}
var answer string
if answer, err = suber.GetAnswer(); err == nil {
b, _ := json.Marshal(map[string]string{"type": "answer", "sdp": answer})
err = suber.signalChannel.SendText(string(b))
}
if err != nil {
WebRTCPlugin.Error("Signal GetAnswer", zap.Error(err))
return
}
switch s.Type {
case "publish":
WebRTCPlugin.Publish(s.StreamPath, suber)
case "unpublish":
suber.Stop()
if err = suber.Answer(); err == nil {
switch s.Type {
case "publish":
WebRTCPlugin.Publish(s.StreamPath, suber)
case "unpublish":
suber.Stop()
}
}
case "answer":
if err = suber.SetRemoteDescription(SessionDescription{Type: SDPTypeAnswer, SDP: s.Answer}); err != nil {