1 files changed, 46 insertions, 6 deletions

diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c
index d5aa635f548..94fe1f44d91 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -145,7 +145,7 @@ static void check_unused_keys(MovieCache *cache)
 	GHashIterator *iter;
 
 	iter = BLI_ghashIterator_new(cache->hash);
-	while (!BLI_ghashIterator_isDone(iter)) {
+	while (BLI_ghashIterator_notDone(iter)) {
 		MovieCacheKey *key = BLI_ghashIterator_getKey(iter);
 		MovieCacheItem *item = BLI_ghashIterator_getValue(iter);
 		int remove = 0;
@@ -306,7 +306,7 @@ void IMB_moviecache_set_priority_callback(struct MovieCache *cache, MovieCacheGe
 	cache->prioritydeleterfp = prioritydeleterfp;
 }
 
-void IMB_moviecache_put(MovieCache *cache, void *userkey, ImBuf *ibuf)
+static void do_moviecache_put(MovieCache *cache, void *userkey, ImBuf *ibuf, int need_lock)
 {
 	MovieCacheKey *key;
 	MovieCacheItem *item;
@@ -341,7 +341,8 @@ void IMB_moviecache_put(MovieCache *cache, void *userkey, ImBuf *ibuf)
 		memcpy(cache->last_userkey, userkey, cache->keysize);
 	}
 
-	BLI_mutex_lock(&limitor_lock);
+	if (need_lock)
+		BLI_mutex_lock(&limitor_lock);
 
 	item->c_handle = MEM_CacheLimiter_insert(limitor, item);
 
@@ -349,7 +350,8 @@ void IMB_moviecache_put(MovieCache *cache, void *userkey, ImBuf *ibuf)
 	MEM_CacheLimiter_enforce_limits(limitor);
 	MEM_CacheLimiter_unref(item->c_handle);
 
-	BLI_mutex_unlock(&limitor_lock);
+	if (need_lock)
+		BLI_mutex_unlock(&limitor_lock);
 
 	/* cache limiter can't remove unused keys which points to destoryed values */
 	check_unused_keys(cache);
@@ -360,6 +362,32 @@ void IMB_moviecache_put(MovieCache *cache, void *userkey, ImBuf *ibuf)
 	}
 }
 
+void IMB_moviecache_put(MovieCache *cache, void *userkey, ImBuf *ibuf)
+{
+	do_moviecache_put(cache, userkey, ibuf, TRUE);
+}
+
+int IMB_moviecache_put_if_possible(MovieCache *cache, void *userkey, ImBuf *ibuf)
+{
+	size_t mem_in_use, mem_limit, elem_size;
+	int result = FALSE;
+
+	elem_size = IMB_get_size_in_memory(ibuf);
+	mem_limit = MEM_CacheLimiter_get_maximum();
+
+	BLI_mutex_lock(&limitor_lock);
+	mem_in_use = MEM_CacheLimiter_get_memory_in_use(limitor);
+
+	if (mem_in_use + elem_size <= mem_limit) {
+		do_moviecache_put(cache, userkey, ibuf, FALSE);
+		result = TRUE;
+	}
+
+	BLI_mutex_unlock(&limitor_lock);
+
+	return result;
+}
+
 ImBuf *IMB_moviecache_get(MovieCache *cache, void *userkey)
 {
 	MovieCacheKey key;
@@ -384,6 +412,18 @@ ImBuf *IMB_moviecache_get(MovieCache *cache, void *userkey)
 	return NULL;
 }
 
+int IMB_moviecache_has_frame(MovieCache *cache, void *userkey)
+{
+	MovieCacheKey key;
+	MovieCacheItem *item;
+
+	key.cache_owner = cache;
+	key.userkey = userkey;
+	item = (MovieCacheItem *)BLI_ghash_lookup(cache->hash, &key);
+
+	return item != NULL;
+}
+
 void IMB_moviecache_free(MovieCache *cache)
 {
 	PRINT("%s: cache '%s' free\n", __func__, cache->name);
@@ -408,7 +448,7 @@ void IMB_moviecache_cleanup(MovieCache *cache, int (cleanup_check_cb) (void *use
 	GHashIterator *iter;
 
 	iter = BLI_ghashIterator_new(cache->hash);
-	while (!BLI_ghashIterator_isDone(iter)) {
+	while (BLI_ghashIterator_notDone(iter)) {
 		MovieCacheKey *key = BLI_ghashIterator_getKey(iter);
 		int remove;
 
@@ -457,7 +497,7 @@ void IMB_moviecache_get_cache_segments(MovieCache *cache, int proxy, int render_
 
 		iter = BLI_ghashIterator_new(cache->hash);
 		a = 0;
-		while (!BLI_ghashIterator_isDone(iter)) {
+		while (BLI_ghashIterator_notDone(iter)) {
 			MovieCacheKey *key = BLI_ghashIterator_getKey(iter);
 			MovieCacheItem *item = BLI_ghashIterator_getValue(iter);
 			int framenr, curproxy, curflags;