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

feat: AVPacket使用sync.Pool管理, 减少内存碎片

Browse Source
This commit is contained in:
ydajiang
2025-06-08 21:27:12 +08:00
parent a7b233681c
commit 059bc20018
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
stream/source.go
View File

@@ -211,6 +211,11 @@ func (s *PublishSource) DoClose() {
s.TransDemuxer.Close() s.TransDemuxer.Close()
} }
// 释放packet
for _, track := range s.originTracks.All() {
s.clearUnusedPackets(track.Packets)
}
// 等传输流发布器关闭结束 // 等传输流发布器关闭结束
s.streamPublisher.close() s.streamPublisher.close()
@@ -334,13 +339,23 @@ func (s *PublishSource) OnPacket(packet *avformat.AVPacket) {
s.streamPublisher.Post(&StreamEvent{StreamEventTypePacket, packetPtr}) s.streamPublisher.Post(&StreamEvent{StreamEventTypePacket, packetPtr})
// 释放未引用的AVPacket // 释放未引用的AVPacket
s.clearUnusedPackets(packets)
}
func (s *PublishSource) clearUnusedPackets(packets *collections.LinkedList[*collections.ReferenceCounter[*avformat.AVPacket]]) {
for packets.Size() > 0 { for packets.Size() > 0 {
if packets.Get(0).UseCount() > 1 { if packets.Get(0).UseCount() > 1 {
break break
} }
packets.Remove(0).Release() unusedPacketPtr := packets.Remove(0)
s.TransDemuxer.DiscardHeadPacket(packet.BufferIndex) bufferIndex := unusedPacketPtr.Get().BufferIndex
// 引用计数减1
unusedPacketPtr.Release()
// AVPacket放回池中, 减少AVPacket分配
avformat.FreePacket(unusedPacketPtr.Get())
// 释放AVPacket的Data缓冲区
s.TransDemuxer.DiscardHeadPacket(bufferIndex)
} }
} }

18
stream/stream_publisher.go
View File

@@ -464,7 +464,7 @@ func (t *transStreamPublisher) FindSink(id SinkID) Sink {
return result return result
} }
func (t *transStreamPublisher) cleanupSinkStreaming(sink Sink) { func (t *transStreamPublisher) clearSinkStreaming(sink Sink) {
transStreamSinks := t.transStreamSinks[sink.GetTransStreamID()] transStreamSinks := t.transStreamSinks[sink.GetTransStreamID()]
delete(transStreamSinks, sink.GetID()) delete(transStreamSinks, sink.GetID())
t.lastStreamEndTime = time.Now() t.lastStreamEndTime = time.Now()
@@ -472,7 +472,7 @@ func (t *transStreamPublisher) cleanupSinkStreaming(sink Sink) {
} }
func (t *transStreamPublisher) doRemoveSink(sink Sink) bool { func (t *transStreamPublisher) doRemoveSink(sink Sink) bool {
t.cleanupSinkStreaming(sink) t.clearSinkStreaming(sink)
delete(t.sinks, sink.GetID()) delete(t.sinks, sink.GetID())
t.sinkCount-- t.sinkCount--
@@ -494,7 +494,7 @@ func (t *transStreamPublisher) doClose() {
// 释放GOP缓存 // 释放GOP缓存
if t.gopBuffer != nil { if t.gopBuffer != nil {
t.ClearGopBuffer() t.ClearGopBuffer(true)
t.gopBuffer = nil t.gopBuffer = nil
} }
@@ -596,7 +596,7 @@ func (t *transStreamPublisher) WriteHeader() {
// 如果不存在视频帧, 清空GOP缓存 // 如果不存在视频帧, 清空GOP缓存
if !t.existVideo { if !t.existVideo {
t.ClearGopBuffer() t.ClearGopBuffer(false)
t.gopBuffer = nil t.gopBuffer = nil
} }
} }
@@ -613,10 +613,14 @@ func (t *transStreamPublisher) Sinks() []Sink {
return sinks return sinks
} }
func (t *transStreamPublisher) ClearGopBuffer() { // ClearGopBuffer 清空GOP缓存, 在关闭stream publisher时, free为true, AVPacket放回池中. 如果free为false, 由Source放回池中.
func (t *transStreamPublisher) ClearGopBuffer(free bool) {
t.gopBuffer.PopAll(func(packet *collections.ReferenceCounter[*avformat.AVPacket]) { t.gopBuffer.PopAll(func(packet *collections.ReferenceCounter[*avformat.AVPacket]) {
packet.Release() if packet.Release() && free {
avformat.FreePacket(packet.Get())
}
// 释放annexb和avcc格式转换的缓存
if t.bitstreamFilterBuffer != nil { if t.bitstreamFilterBuffer != nil {
t.bitstreamFilterBuffer.Pop() t.bitstreamFilterBuffer.Pop()
} }
@@ -636,7 +640,7 @@ func (t *transStreamPublisher) OnPacket(packet *collections.ReferenceCounter[*av
// GOP队列溢出 // GOP队列溢出
if t.gopBuffer.RequiresClear(packet) { if t.gopBuffer.RequiresClear(packet) {
t.ClearGopBuffer() t.ClearGopBuffer(false)
} }
t.gopBuffer.AddPacket(packet) t.gopBuffer.AddPacket(packet)