CEF/imagorvideoextended
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix(ffmpeg): free memory on close

Browse source
This commit is contained in:
Adrian Shum 2022-09-11 15:37:25 +08:00 • committed by GitHub
parent 2b72572127
commit 01ad70e46c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ffmpeg/ffmpeg.go
View file

@ -88,6 +88,9 @@ func (av *AVContext) ExportImage() ([]byte, error) {
} }
func (av *AVContext) Close() { func (av *AVContext) Close() {
if av.hasFrame {
C.av_frame_free(&av.frame)
}
freeFormatContext(av) freeFormatContext(av)
} }

5
processor.go
View file

@ -96,10 +96,10 @@ func (p *Processor) Process(ctx context.Context, in *imagor.Blob, params imagorp
return return
} }
var filename = file.Name() var filename = file.Name()
imagor.Defer(ctx, func() { defer func() {
_ = os.Remove(filename) _ = os.Remove(filename)
p.Logger.Debug("cleanup", zap.String("file", filename)) p.Logger.Debug("cleanup", zap.String("file", filename))
}) }()
if size, err = io.Copy(file, reader); err != nil { if size, err = io.Copy(file, reader); err != nil {
return return
} }
@ -116,6 +116,7 @@ func (p *Processor) Process(ctx context.Context, in *imagor.Blob, params imagorp
if err != nil { if err != nil {
return return
} }
defer av.Close()
meta := av.Metadata() meta := av.Metadata()
if params.Meta { if params.Meta {
out = imagor.NewBlobFromJsonMarshal(meta) out = imagor.NewBlobFromJsonMarshal(meta)