chroe: fit engine's update

This commit is contained in:
langhuihui
2023-05-14 16:24:31 +08:00
parent 29dd7a2505
commit 5d3f632c15
2 changed files with 2 additions and 6 deletions

View File

@@ -60,7 +60,6 @@ type WebRTCConfig struct {
config.Subscribe config.Subscribe
ICEServers []ICEServer ICEServers []ICEServer
PublicIP []string PublicIP []string
PublicPort uint16
Port string `default:"tcp:9000"` Port string `default:"tcp:9000"`
PLI time.Duration `default:"2s"` // 视频流丢包后发送PLI请求 PLI time.Duration `default:"2s"` // 视频流丢包后发送PLI请求
m MediaEngine m MediaEngine
@@ -137,9 +136,6 @@ func (conf *WebRTCConfig) Play_(w http.ResponseWriter, r *http.Request) {
suber.OnICECandidate(func(ice *ICECandidate) { suber.OnICECandidate(func(ice *ICECandidate) {
if ice != nil { if ice != nil {
suber.Info(ice.ToJSON().Candidate) suber.Info(ice.ToJSON().Candidate)
if conf.PublicPort != 0 {
ice.Port = conf.PublicPort
}
} }
}) })
if err = suber.SetRemoteDescription(SessionDescription{Type: SDPTypeOffer, SDP: suber.SDP}); err != nil { if err = suber.SetRemoteDescription(SessionDescription{Type: SDPTypeOffer, SDP: suber.SDP}); err != nil {

View File

@@ -120,13 +120,13 @@ func (suber *WebRTCSubscriber) OnEvent(event any) {
suber.Trace("video rtp", zap.Any("packet", v.Packet.Header)) suber.Trace("video rtp", zap.Any("packet", v.Packet.Header))
suber.videoTrack.WriteRTP(v.Packet) suber.videoTrack.WriteRTP(v.Packet)
} else if suber.DC != nil { } else if suber.DC != nil {
suber.sendAvByDatachannel(9, &suber.VideoReader) suber.sendAvByDatachannel(9, suber.VideoReader)
} }
case AudioRTP: case AudioRTP:
if suber.audioTrack != nil { if suber.audioTrack != nil {
suber.audioTrack.WriteRTP(v.Packet) suber.audioTrack.WriteRTP(v.Packet)
} else if suber.DC != nil { } else if suber.DC != nil {
suber.sendAvByDatachannel(8, &suber.AudioReader) suber.sendAvByDatachannel(8, suber.AudioReader)
} }
case ISubscriber: case ISubscriber:
suber.OnConnectionStateChange(func(pcs PeerConnectionState) { suber.OnConnectionStateChange(func(pcs PeerConnectionState) {