From db54d6ee4d1726f5cdbec159a3d15bbe81ada2d7 Mon Sep 17 00:00:00 2001 From: dexter <178529795@qq.com> Date: Sat, 25 Jun 2022 20:13:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=BC=95=E6=93=8E4.4.0?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- subscriber.go | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index bd30be9..2f3eecb 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ https://github.com/Monibuca/plugin-webrtc ```yaml webrtc: iceservers: [] - publicip: [] + publicip: [] # 可以是数组也可以是字符串(内部自动转成数组) portmin: 0 portmax: 0 pli: 2000000000 # 2s diff --git a/subscriber.go b/subscriber.go index c329890..48033c6 100644 --- a/subscriber.go +++ b/subscriber.go @@ -40,8 +40,7 @@ func (suber *WebRTCSubscriber) OnEvent(event any) { for _, pp := range p { switch pp.(type) { case *rtcp.PictureLossIndication: - - fmt.Println("PictureLossIndication") + // fmt.Println("PictureLossIndication") } } } @@ -60,20 +59,16 @@ func (suber *WebRTCSubscriber) OnEvent(event any) { suber.PeerConnection.AddTrack(suber.audioTrack) suber.Subscriber.AddTrack(v) //接受这个track } - case *VideoFrame: - for _, p := range v.RTP { - suber.videoTrack.Write(p.Raw) - } - case *AudioFrame: - for _, p := range v.RTP { - suber.audioTrack.Write(p.Raw) - } + case VideoRTP: + suber.videoTrack.WriteRTP(&v.Packet) + case AudioRTP: + suber.audioTrack.WriteRTP(&v.Packet) case ISubscriber: suber.OnConnectionStateChange(func(pcs PeerConnectionState) { suber.Info("Connection State has changed:" + pcs.String()) switch pcs { case PeerConnectionStateConnected: - go suber.PlayRaw() + go suber.PlayRTP() case PeerConnectionStateDisconnected, PeerConnectionStateFailed: suber.Stop() suber.PeerConnection.Close()