apps/donut
1
0
Fork 0
mirror of https://github.com/flavioribeiro/donut.git synced 2025-10-05 15:06:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix potential memory leak

Browse Source
This commit is contained in:
Leandro Moreira
2024-05-15 23:01:36 -03:00
parent 8e4306c0f7
commit 1a2f958063
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/controllers/streamers/libav_ffmpeg.go
View File

@@ -76,6 +76,7 @@ type streamContext struct {
// Bit stream filter // Bit stream filter
bsfContext *astiav.BitStreamFilterContext bsfContext *astiav.BitStreamFilterContext
bsfPacket *astiav.Packet
} }
type libAVParams struct { type libAVParams struct {
@@ -151,7 +152,7 @@ func (c *LibAVFFmpegStreamer) Stream(donut *entities.DonutParameters) {
} }
if s.bsfContext != nil { if s.bsfContext != nil {
if err := c.applyBitStreamFilter(inPkt, s, closer, donut); err != nil { if err := c.applyBitStreamFilter(inPkt, s, donut); err != nil {
c.onError(err, donut) c.onError(err, donut)
return return
} }
@@ -495,6 +496,8 @@ func (c *LibAVFFmpegStreamer) prepareBitStreamFilters(p *libAVParams, closer *as
if err := s.bsfContext.Initialize(); err != nil { if err := s.bsfContext.Initialize(); err != nil {
return fmt.Errorf("error while initiating %w", err) return fmt.Errorf("error while initiating %w", err)
} }
s.bsfPacket = astiav.AllocPacket()
closer.Add(s.bsfPacket.Free)
} }
return nil return nil
} }
@@ -563,25 +566,21 @@ func (c *LibAVFFmpegStreamer) processPacket(pkt *astiav.Packet, s *streamContext
return nil return nil
} }
func (c *LibAVFFmpegStreamer) applyBitStreamFilter(pkt *astiav.Packet, s *streamContext, closer *astikit.Closer, donut *entities.DonutParameters) error { func (c *LibAVFFmpegStreamer) applyBitStreamFilter(pkt *astiav.Packet, s *streamContext, donut *entities.DonutParameters) error {
bitStreamPkt := astiav.AllocPacket()
closer.Add(bitStreamPkt.Free)
// TODO: enable bsf per stream
if err := s.bsfContext.SendPacket(pkt); err != nil && !errors.Is(err, astiav.ErrEagain) { if err := s.bsfContext.SendPacket(pkt); err != nil && !errors.Is(err, astiav.ErrEagain) {
return fmt.Errorf("sending bit stream packet failed: %w", err) return fmt.Errorf("sending bit stream packet failed: %w", err)
} }
for { for {
if err := s.bsfContext.ReceivePacket(bitStreamPkt); err != nil { if err := s.bsfContext.ReceivePacket(s.bsfPacket); err != nil {
if errors.Is(err, astiav.ErrEof) || errors.Is(err, astiav.ErrEagain) { if errors.Is(err, astiav.ErrEof) || errors.Is(err, astiav.ErrEagain) {
break break
} }
return fmt.Errorf("receiving bit stream packet failed: %w", err) return fmt.Errorf("receiving bit stream packet failed: %w", err)
} }
c.processPacket(bitStreamPkt, s, donut) c.processPacket(s.bsfPacket, s, donut)
bitStreamPkt.Unref() s.bsfPacket.Unref()
} }
return nil return nil
} }