apps/lkm
1
0
Fork 0
mirror of https://github.com/lkmio/lkm.git synced 2025-09-27 03:26:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 关闭推流失败的source时, 造成相同id的source被错误关闭问题;

Browse Source
This commit is contained in:
ydajiang
2025-08-06 14:05:50 +08:00
parent 791f75c54c
commit 7806098ad6
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
stream/hook_source.go
View File

@@ -32,6 +32,7 @@ func PreparePublishSource(source Source, hook bool) (*http.Response, utils.HookS
log.Sugar.Infof("%s准备推流 source:%s 拉流地址:\r\n%s", source.GetType().String(), source.GetID(), indent) log.Sugar.Infof("%s准备推流 source:%s 拉流地址:\r\n%s", source.GetType().String(), source.GetID(), indent)
source.SetState(SessionStateTransferring)
return response, utils.HookStateOK return response, utils.HookStateOK
} }

16
stream/source.go
View File

@@ -105,8 +105,7 @@ type PublishSource struct {
createTime time.Time // source创建时间 createTime time.Time // source创建时间
statistics *BitrateStatistics // 码流统计 statistics *BitrateStatistics // 码流统计
streamLogger avformat.OnUnpackStream2FileHandler streamLogger avformat.OnUnpackStream2FileHandler
// streamLock sync.RWMutex streamLock sync.Mutex // 收流、探测超时、关闭等操作互斥锁
streamLock sync.Mutex
timers struct { timers struct {
receiveTimer *time.Timer // 收流超时计时器 receiveTimer *time.Timer // 收流超时计时器
@@ -139,7 +138,7 @@ func (s *PublishSource) SetID(id string) {
} }
func (s *PublishSource) Init() { func (s *PublishSource) Init() {
s.SetState(SessionStateHandshakeSuccess) s.SetState(SessionStateCreated)
s.statistics = NewBitrateStatistics() s.statistics = NewBitrateStatistics()
s.streamPublisher = NewTransStreamPublisher(s.ID) s.streamPublisher = NewTransStreamPublisher(s.ID)
@@ -180,6 +179,7 @@ func (s *PublishSource) SetState(state SessionState) {
func (s *PublishSource) DoClose() { func (s *PublishSource) DoClose() {
log.Sugar.Debugf("closing the %s source. id: %s. closed flag: %t", s.Type, s.ID, s.closed.Load()) log.Sugar.Debugf("closing the %s source. id: %s. closed flag: %t", s.Type, s.ID, s.closed.Load())
// 已关闭, 直接返回
if s.closed.Load() { if s.closed.Load() {
return return
} }
@@ -189,6 +189,7 @@ func (s *PublishSource) DoClose() {
closed = s.closed.Swap(true) closed = s.closed.Swap(true)
}) })
// 已关闭, 直接返回
if closed { if closed {
return return
} }
@@ -216,9 +217,16 @@ func (s *PublishSource) DoClose() {
s.clearUnusedPackets(track.Packets) s.clearUnusedPackets(track.Packets)
} }
// 等传输流发布器关闭结束 // 停止发布输出流
// 同步执行
s.streamPublisher.close() s.streamPublisher.close()
// 只释放prepare成功的source, 否则在关闭失败的source时, 造成id相同的source被错误释放
if s.state < SessionStateTransferring {
return
}
s.state = SessionStateClosed
// 释放解复用器 // 释放解复用器
// 释放转码器 // 释放转码器
// 释放每路转协议流， 将所有sink添加到等待队列 // 释放每路转协议流， 将所有sink添加到等待队列