From bea4701c23954521876058f95a76b29769a651ce Mon Sep 17 00:00:00 2001 From: q191201771 <191201771@qq.com> Date: Thu, 20 Apr 2023 13:47:17 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20rtsp:=20=E6=92=AD=E6=94=BE=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84rtsp=E6=B5=81=EF=BC=8C=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=9C=89=E5=BD=BB=E5=BA=95=E9=87=8A=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/logic/group__.go | 4 ++-- pkg/logic/group__out_sub.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/logic/group__.go b/pkg/logic/group__.go index 773ad6c..570160f 100644 --- a/pkg/logic/group__.go +++ b/pkg/logic/group__.go @@ -119,8 +119,8 @@ type Group struct { rtmpSubSessionSet map[*rtmp.ServerSession]struct{} httpflvSubSessionSet map[*httpflv.SubSession]struct{} httptsSubSessionSet map[*httpts.SubSession]struct{} - rtspSubSessionSet map[*rtsp.SubSession]struct{} - waitRtspSubSessionSet map[*rtsp.SubSession]struct{} + rtspSubSessionSet map[*rtsp.SubSession]struct{} // 注意,使用这个容器时,一定要注意是否需要使用 waitRtspSubSessionSet + waitRtspSubSessionSet map[*rtsp.SubSession]struct{} // 注意,见 rtspSubSessionSet hlsSubSessionSet map[*hls.SubSession]struct{} // push pushEnable bool diff --git a/pkg/logic/group__out_sub.go b/pkg/logic/group__out_sub.go index d7b1dcb..1a830cc 100644 --- a/pkg/logic/group__out_sub.go +++ b/pkg/logic/group__out_sub.go @@ -150,6 +150,7 @@ func (group *Group) delHttptsSubSession(session *httpts.SubSession) { func (group *Group) delRtspSubSession(session *rtsp.SubSession) { Log.Debugf("[%s] [%s] del rtsp SubSession from group.", group.UniqueKey, session.UniqueKey()) + delete(group.waitRtspSubSessionSet, session) delete(group.rtspSubSessionSet, session) }