diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-12-13 14:22:08 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-12-13 14:30:00 +0400 |
commit | ce893552c359d11cfa93709f239a3c93f4cdb244 (patch) | |
tree | d9474f190006e89547044c241081f320c44c3a36 /source/blender/imbuf/intern/moviecache.c | |
parent | 7eab49f8d923ed3992dff1236e30a62f2d70f460 (diff) |
Image cache rewrite to using generic movie cache
Summary:
Behaves very much the same as cache for Movie Clip datablock:
- Image now have `MovieCache *cache` field which replaced
legacy `ListBase ibufs`.
This allows image datablock to easily keep of image
buffers which are owned by itself. This field isn't
saved to the file and getting restored on undo steps.
However, cache limit is global for movies, sequences
and image datablocks now. So overall cached image buffers
size will not go above cache limit size in user
preferences.
- Image buffers which are marked as BITMAPDIRTY will never
be freed from the cache.
- Added utility function to iterate over image buffers
saved in movie cache.
- Movie cache cleanup check callback now have ImBuf argument
which can be used in a condition of cleanup.
- Added some utility functions which replaces legacy ibufs
iterations with image cache iteration which happens from
inside a lock.
- Fixed `image_mem_size()` which was only counting one of
the buffers if both float and byte buffer present.
Additional notes:
- `BKE_image_get_first_ibuf()` is rather stupid, but direct
access to ibufs->first was also the same stupid idea.
Would consider avoid this function is another project.
- There are some places which doesn't look threadsafe, but
they already were not so much threadsafe anyway before.
So think not a big deal with solving this later.
Finally solves infinite memory usage by image sequences! :)
Reviewers: brecht, campbellbarton
Reviewed By: brecht
CC: sebastian_k
Differential Revision: http://developer.blender.org/D95
Diffstat (limited to 'source/blender/imbuf/intern/moviecache.c')
-rw-r--r-- | source/blender/imbuf/intern/moviecache.c | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index 90eea438c5e..c287cf4c005 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -443,23 +443,18 @@ void IMB_moviecache_free(MovieCache *cache) MEM_freeN(cache); } -void IMB_moviecache_cleanup(MovieCache *cache, int (cleanup_check_cb) (void *userkey, void *userdata), void *userdata) +void IMB_moviecache_cleanup(MovieCache *cache, bool (cleanup_check_cb) (ImBuf *ibuf, void *userkey, void *userdata), void *userdata) { GHashIterator *iter; iter = BLI_ghashIterator_new(cache->hash); while (!BLI_ghashIterator_done(iter)) { MovieCacheKey *key = BLI_ghashIterator_getKey(iter); - int remove; + MovieCacheItem *item = BLI_ghashIterator_getValue(iter); BLI_ghashIterator_step(iter); - remove = cleanup_check_cb(key->userkey, userdata); - - if (remove) { - MovieCacheItem *item = BLI_ghashIterator_getValue(iter); - (void) item; /* silence unused variable when not using debug */ - + if (cleanup_check_cb(item->ibuf, key->userkey, userdata)) { PRINT("%s: cache '%s' remove item %p\n", __func__, cache->name, item); BLI_ghash_remove(cache->hash, key, moviecache_keyfree, moviecache_valfree); @@ -556,3 +551,36 @@ void IMB_moviecache_get_cache_segments(MovieCache *cache, int proxy, int render_ MEM_freeN(frames); } } + +struct MovieCacheIter *IMB_moviecacheIter_new(MovieCache *cache) +{ + GHashIterator *iter = BLI_ghashIterator_new(cache->hash); + return (struct MovieCacheIter *) iter; +} + +void IMB_moviecacheIter_free(struct MovieCacheIter *iter) +{ + BLI_ghashIterator_free((GHashIterator *) iter); +} + +bool IMB_moviecacheIter_done(struct MovieCacheIter *iter) +{ + return BLI_ghashIterator_done((GHashIterator *) iter); +} + +void IMB_moviecacheIter_step(struct MovieCacheIter *iter) +{ + BLI_ghashIterator_step((GHashIterator *) iter); +} + +ImBuf *IMB_moviecacheIter_getImBuf(struct MovieCacheIter *iter) +{ + MovieCacheItem *item = BLI_ghashIterator_getValue((GHashIterator *) iter); + return item->ibuf; +} + +void *IMB_moviecacheIter_getUserKey(struct MovieCacheIter *iter) +{ + MovieCacheKey *key = BLI_ghashIterator_getKey((GHashIterator *) iter); + return key->userkey; +} |