From 876354e58e7fb6d2210c0e372694b25243d67f88 Mon Sep 17 00:00:00 2001 From: Deluan Date: Wed, 26 Feb 2020 14:08:14 -0500 Subject: [PATCH] feat: MaxTranscodingCacheSize is now specified in MB --- conf/configuration.go | 2 +- engine/media_streamer.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/configuration.go b/conf/configuration.go index f25fef27b..876344996 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -25,7 +25,7 @@ type nd struct { EnableDownsampling bool `default:"false"` MaxBitRate int `default:"0"` - MaxTranscodingCacheSize int64 `default:"100000000"` // 100MB + MaxTranscodingCacheSize int64 `default:"100"` // in MB DownsampleCommand string `default:"ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -"` ProbeCommand string `default:"ffmpeg -i %s -f ffmetadata"` diff --git a/engine/media_streamer.go b/engine/media_streamer.go index ce25e59ea..962c39ca4 100644 --- a/engine/media_streamer.go +++ b/engine/media_streamer.go @@ -172,7 +172,7 @@ func getFinalCachedSize(r fscache.ReadAtCloser) int64 { } func NewTranscodingCache() (fscache.Cache, error) { - lru := fscache.NewLRUHaunter(0, conf.Server.MaxTranscodingCacheSize, 10*time.Minute) + lru := fscache.NewLRUHaunter(0, conf.Server.MaxTranscodingCacheSize*1024*1024, 10*time.Minute) h := fscache.NewLRUHaunterStrategy(lru) cacheFolder := filepath.Join(conf.Server.DataFolder, consts.CacheDir) fs, err := fscache.NewFs(cacheFolder, 0755)