diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-01 22:08:37 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-01 22:08:37 +0400 |
commit | f193291b32bceeb91a5d0d69554d6e2d56538df0 (patch) | |
tree | b4a0ada454ff2d3d0e69afae49c8a50a5eb4c756 /source/blender/editors | |
parent | d882f05b824f4111ef5c319c89a2f85b1773c579 (diff) |
Movie Clip Editor: proxy sizes for original and undistortted footages are now controlling separately
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 5053379d376..5d0f294b06a 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -834,6 +834,27 @@ static void proxy_freejob(void *pjv) MEM_freeN(pj); } +static int proxy_bitflag_to_array(int size_flag, int build_sizes[4], int undistort) +{ + int build_count = 0; + int size_flags[2][4] = {{MCLIP_PROXY_SIZE_25, + MCLIP_PROXY_SIZE_50, + MCLIP_PROXY_SIZE_75, + MCLIP_PROXY_SIZE_100}, + {MCLIP_PROXY_UNDISTORTED_SIZE_25, + MCLIP_PROXY_UNDISTORTED_SIZE_50, + MCLIP_PROXY_UNDISTORTED_SIZE_75, + MCLIP_PROXY_UNDISTORTED_SIZE_100}}; + int size_nr = undistort ? 1 : 0; + + if(size_flag & size_flags[size_nr][0]) build_sizes[build_count++]= MCLIP_PROXY_RENDER_SIZE_25; + if(size_flag & size_flags[size_nr][1]) build_sizes[build_count++]= MCLIP_PROXY_RENDER_SIZE_50; + if(size_flag & size_flags[size_nr][2]) build_sizes[build_count++]= MCLIP_PROXY_RENDER_SIZE_75; + if(size_flag & size_flags[size_nr][3]) build_sizes[build_count++]= MCLIP_PROXY_RENDER_SIZE_100; + + return build_count; +} + /* only this runs inside thread */ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *progress) { @@ -841,22 +862,23 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog Scene *scene=pj->scene; MovieClip *clip= pj->clip; struct MovieDistortion *distortion= NULL; - int cfra, undistort; - short tc_flag, size_flag, quality, build_flag; - int sfra= SFRA, efra= EFRA; + short tc_flag, size_flag, quality; + int cfra, sfra= SFRA, efra= EFRA; int build_sizes[4], build_count= 0; + int build_undistort_sizes[4], build_undistort_count= 0; tc_flag= clip->proxy.build_tc_flag; size_flag= clip->proxy.build_size_flag; quality= clip->proxy.quality; - build_flag= clip->proxy.build_flag; - undistort= build_flag&MCLIP_PROXY_RENDER_UNDISTORT; + + build_count= proxy_bitflag_to_array(size_flag, build_sizes, 0); + build_undistort_count= proxy_bitflag_to_array(size_flag, build_undistort_sizes, 1); if(clip->source == MCLIP_SRC_MOVIE) { if(clip->anim) IMB_anim_index_rebuild(clip->anim, tc_flag, size_flag, quality, stop, do_update, progress); - if(!undistort) { + if(!build_undistort_count) { return; } else { @@ -865,20 +887,14 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog } } - if(size_flag&IMB_PROXY_25) build_sizes[build_count++]= MCLIP_PROXY_RENDER_SIZE_25; - if(size_flag&IMB_PROXY_50) build_sizes[build_count++]= MCLIP_PROXY_RENDER_SIZE_50; - if(size_flag&IMB_PROXY_75) build_sizes[build_count++]= MCLIP_PROXY_RENDER_SIZE_75; - if(size_flag&IMB_PROXY_100) build_sizes[build_count++]= MCLIP_PROXY_RENDER_SIZE_100; - - if(undistort) + if(build_undistort_count) distortion= BKE_tracking_distortion_create(); for(cfra= sfra; cfra<=efra; cfra++) { if(clip->source != MCLIP_SRC_MOVIE) BKE_movieclip_build_proxy_frame(clip, pj->clip_flag, NULL, cfra, build_sizes, build_count, 0); - if(undistort) - BKE_movieclip_build_proxy_frame(clip, pj->clip_flag, distortion, cfra, build_sizes, build_count, 1); + BKE_movieclip_build_proxy_frame(clip, pj->clip_flag, distortion, cfra, build_undistort_sizes, build_undistort_count, 1); if(*stop || G.afbreek) break; |