diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-20 21:03:20 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-20 21:03:20 +0400 |
commit | 808ac6debf45952974c5723bf93a83b1107d6e61 (patch) | |
tree | 36cac1c201f137f373f03b8c626e8263bf26e507 /intern | |
parent | 09a604561d39db04330da1c1833be3b6fa1329b6 (diff) |
Prefetching for movie clips
This commit basically implements frames prefetching for
movie clip datablock.
Number of frames to be prefetched is controlled in User
Preferences, System tab, Prefetch Frames option.
Currently prefetching is destructive-less for movie cache,
meaning mo frames will be removed from the cache when while
prefetching. This is because it's half of simplier to
implement, but it also makes sense from tracking point of
view -- we could want to playback in both directions and
removing frames from behind time cursor is not always a
good idea.
Anyway, smarter prefetching strategy could be developed
later.
Some implementation notes:
- Added MEM_CacheLimiter_get_memory_in_use function to get
memory usage of specified memory limiter.
- Fixed prototype of MEM_CacheLimiter_get_maximum which
was simply wrong (used wrong data type for output).
- Added some utility functions to movie clip and movie
cache for direct cache interaction and obtaining cache
statistics.
- Prefetching is implemented using general jobs system.
which is invoking from clip draw function.
- Prefetcing will stop as soon other job or playback starts.
This is done from performance point of view. Jobs will
likely require lots of CPU power and better to provide
whole CPU to it.
Playback is a bit more complicated case. For jpeg sequence
playback prefetching while paying back is nice. But trying
to prefetch heavy exr images and doing color space
conversion slows down both playback and prefetching.
TODO:
- Think of better policy of dealing with already cached frames
(like when cached frames from other clips prevents frames
from current clip to be prefetched)
- Currently a bit funky redraw notification happens from
prefetch job. Perhaps own ND_ is better to have here.
- Hiding clip while prefetch is active in theory shall stop
prefetching job.
- Having multiple clips opened on file load will prefetch
frames for only one of them.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/memutil/MEM_CacheLimiter.h | 14 | ||||
-rw-r--r-- | intern/memutil/MEM_CacheLimiterC-Api.h | 4 | ||||
-rw-r--r-- | intern/memutil/intern/MEM_CacheLimiterC-Api.cpp | 5 |
3 files changed, 16 insertions, 7 deletions
diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h index 4e776929731..dec4d0b1c30 100644 --- a/intern/memutil/MEM_CacheLimiter.h +++ b/intern/memutil/MEM_CacheLimiter.h @@ -161,6 +161,13 @@ public: delete handle; } + size_t get_memory_in_use() { + if (getDataSize) + return total_size(); + else + return MEM_get_memory_in_use(); + } + void enforce_limits() { size_t max = MEM_CacheLimiter_get_maximum(); size_t mem_in_use, cur_size; @@ -169,12 +176,7 @@ public: return; } - if (getDataSize) { - mem_in_use = total_size(); - } - else { - mem_in_use = MEM_get_memory_in_use(); - } + mem_in_use = get_memory_in_use(); if (mem_in_use <= max) { return; diff --git a/intern/memutil/MEM_CacheLimiterC-Api.h b/intern/memutil/MEM_CacheLimiterC-Api.h index c05c9d61ea2..7579dbdd4d1 100644 --- a/intern/memutil/MEM_CacheLimiterC-Api.h +++ b/intern/memutil/MEM_CacheLimiterC-Api.h @@ -49,7 +49,7 @@ typedef int (*MEM_CacheLimiter_ItemPriority_Func) (void*, int); #ifndef __MEM_CACHELIMITER_H__ void MEM_CacheLimiter_set_maximum(size_t m); -int MEM_CacheLimiter_get_maximum(void); +size_t MEM_CacheLimiter_get_maximum(void); #endif /* __MEM_CACHELIMITER_H__ */ /** @@ -145,6 +145,8 @@ void *MEM_CacheLimiter_get(MEM_CacheLimiterHandleC *handle); void MEM_CacheLimiter_ItemPriority_Func_set(MEM_CacheLimiterC *This, MEM_CacheLimiter_ItemPriority_Func item_priority_func); +size_t MEM_CacheLimiter_get_memory_in_use(MEM_CacheLimiterC *This); + #ifdef __cplusplus } #endif diff --git a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp index f946c970711..0e11fbed4e7 100644 --- a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp +++ b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp @@ -202,3 +202,8 @@ void MEM_CacheLimiter_ItemPriority_Func_set(MEM_CacheLimiterC *This, { cast(This)->get_cache()->set_item_priority_func(item_priority_func); } + +size_t MEM_CacheLimiter_get_memory_in_use(MEM_CacheLimiterC *This) +{ + return cast(This)->get_cache()->get_memory_in_use(); +} |