summaryrefslogtreecommitdiff
path: root/src/lib/magick_image_proxy.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-12-29 22:51:50 +0000
committerCarl Hetherington <cth@carlh.net>2017-12-29 22:51:50 +0000
commita5ea5c0d2637dd41e3d356cb62cac75b8cadf8ce (patch)
tree45ed553eeaf52a58dea79f66ab6345df1c1657d0 /src/lib/magick_image_proxy.cc
parent1701be8b9173c675169b5739fbd94f5e6f8d07d1 (diff)
Add basic memory-used stuff for butler and reduce minimum audio
readahead quite a bit. This in turn reduces the maximum butler memory usage as it will keep getting audio (and hence video) until the minimum audio readahead is hit.
Diffstat (limited to 'src/lib/magick_image_proxy.cc')
-rw-r--r--src/lib/magick_image_proxy.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index e6733c7de..0fd4a5edb 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -173,3 +173,13 @@ MagickImageProxy::pixel_format () const
{
return AV_PIX_FMT_RGB24;
}
+
+size_t
+MagickImageProxy::memory_used () const
+{
+ size_t m = _blob.length();
+ if (_image) {
+ m += _image->memory_used();
+ }
+ return m;
+}