sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Code cleanup: use bool/true/false in movieclip.c

Browse Source
This commit is contained in:
Sergey Sharybin 2014-03-31 17:59:50 +06:00
parent c8862806ba
commit a64bcc1037
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/blenkernel/intern/movieclip.c
View File

@ -206,7 +206,8 @@ static ImBuf *movieclip_load_sequence_file(MovieClip *clip, MovieClipUser *user,
{ {
struct ImBuf *ibuf; struct ImBuf *ibuf;
char name[FILE_MAX]; char name[FILE_MAX];
int loadflag, use_proxy = FALSE; int loadflag;
bool use_proxy = false;
char *colorspace; char *colorspace;
use_proxy = (flag & MCLIP_USE_PROXY) && user->render_size != MCLIP_PROXY_RENDER_SIZE_FULL; use_proxy = (flag & MCLIP_USE_PROXY) && user->render_size != MCLIP_PROXY_RENDER_SIZE_FULL;
@ -345,7 +346,7 @@ typedef struct MovieClipCache {
/* cache for undistorted shot */ /* cache for undistorted shot */
float principal[2]; float principal[2];
float k1, k2, k3; float k1, k2, k3;
short undistortion_used; bool undistortion_used;
int proxy; int proxy;
short render_flag; short render_flag;
@ -510,7 +511,7 @@ static bool has_imbuf_cache(MovieClip *clip, MovieClipUser *user, int flag)
return IMB_moviecache_has_frame(clip->cache->moviecache, &key); return IMB_moviecache_has_frame(clip->cache->moviecache, &key);
} }
return FALSE; return false;
} }
static bool put_imbuf_cache(MovieClip *clip, MovieClipUser *user, ImBuf *ibuf, int flag, bool destructive) static bool put_imbuf_cache(MovieClip *clip, MovieClipUser *user, ImBuf *ibuf, int flag, bool destructive)
@ -735,19 +736,19 @@ static int need_postprocessed_frame(MovieClipUser *user, int postprocess_flag)
return result; return result;
} }
static int check_undistortion_cache_flags(MovieClip *clip) static bool check_undistortion_cache_flags(MovieClip *clip)
{ {
MovieClipCache *cache = clip->cache; MovieClipCache *cache = clip->cache;
MovieTrackingCamera *camera = &clip->tracking.camera; MovieTrackingCamera *camera = &clip->tracking.camera;
/* check for distortion model changes */ /* check for distortion model changes */
if (!equals_v2v2(camera->principal, cache->postprocessed.principal)) if (!equals_v2v2(camera->principal, cache->postprocessed.principal))
return FALSE; return false;
if (!equals_v3v3(&camera->k1, &cache->postprocessed.k1)) if (!equals_v3v3(&camera->k1, &cache->postprocessed.k1))
return FALSE; return false;
return TRUE; return true;
} }
static ImBuf *get_postprocessed_cached_frame(MovieClip *clip, MovieClipUser *user, int flag, int postprocess_flag) static ImBuf *get_postprocessed_cached_frame(MovieClip *clip, MovieClipUser *user, int flag, int postprocess_flag)
@ -834,10 +835,10 @@ static void put_postprocessed_frame_to_cache(MovieClip *clip, MovieClipUser *use
if (need_undistortion_postprocess(user)) { if (need_undistortion_postprocess(user)) {
copy_v2_v2(cache->postprocessed.principal, camera->principal); copy_v2_v2(cache->postprocessed.principal, camera->principal);
copy_v3_v3(&cache->postprocessed.k1, &camera->k1); copy_v3_v3(&cache->postprocessed.k1, &camera->k1);
cache->postprocessed.undistortion_used = TRUE; cache->postprocessed.undistortion_used = true;
} }
else { else {
cache->postprocessed.undistortion_used = FALSE; cache->postprocessed.undistortion_used = false;
} }
IMB_refImBuf(ibuf); IMB_refImBuf(ibuf);
@ -852,7 +853,8 @@ static ImBuf *movieclip_get_postprocessed_ibuf(MovieClip *clip, MovieClipUser *u
int postprocess_flag, int cache_flag) int postprocess_flag, int cache_flag)
{ {
ImBuf *ibuf = NULL; ImBuf *ibuf = NULL;
int framenr = user->framenr, need_postprocess = FALSE; int framenr = user->framenr;
bool need_postprocess = false;
/* cache isn't threadsafe itself and also loading of movies /* cache isn't threadsafe itself and also loading of movies
* can't happen from concurent threads that's why we use lock here */ * can't happen from concurent threads that's why we use lock here */
@ -863,14 +865,14 @@ static ImBuf *movieclip_get_postprocessed_ibuf(MovieClip *clip, MovieClipUser *u
ibuf = get_postprocessed_cached_frame(clip, user, flag, postprocess_flag); ibuf = get_postprocessed_cached_frame(clip, user, flag, postprocess_flag);
if (!ibuf) if (!ibuf)
need_postprocess = TRUE; need_postprocess = true;
} }
if (!ibuf) if (!ibuf)
ibuf = get_imbuf_cache(clip, user, flag); ibuf = get_imbuf_cache(clip, user, flag);
if (!ibuf) { if (!ibuf) {
int use_sequence = FALSE; bool use_sequence = false;
/* undistorted proxies for movies should be read as image sequence */ /* undistorted proxies for movies should be read as image sequence */
use_sequence = (user->render_flag & MCLIP_PROXY_RENDER_UNDISTORT) && use_sequence = (user->render_flag & MCLIP_PROXY_RENDER_UNDISTORT) &&
@ -1073,10 +1075,10 @@ bool BKE_movieclip_has_frame(MovieClip *clip, MovieClipUser *user)
if (ibuf) { if (ibuf) {
IMB_freeImBuf(ibuf); IMB_freeImBuf(ibuf);
return TRUE; return true;
} }
return FALSE; return false;
} }
void BKE_movieclip_get_size(MovieClip *clip, MovieClipUser *user, int *width, int *height) void BKE_movieclip_get_size(MovieClip *clip, MovieClipUser *user, int *width, int *height)
@ -1269,7 +1271,7 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
undist_marker.pos[1] /= height * aspy; undist_marker.pos[1] /= height * aspy;
} }
search_ibuf = BKE_tracking_get_search_imbuf(ibuf, track, &undist_marker, TRUE, TRUE); search_ibuf = BKE_tracking_get_search_imbuf(ibuf, track, &undist_marker, true, true);
if (search_ibuf) { if (search_ibuf) {
if (!search_ibuf->rect_float) { if (!search_ibuf->rect_float) {

5
source/blender/blenkernel/intern/tracking_region_tracker.c
View File

@ -585,6 +585,7 @@ static bool configure_and_run_tracker(ImBuf *destination_ibuf, MovieTrackingTrac
return false; return false;
/* run the tracker! */ /* run the tracker! */
#if 0
tracked = libmv_trackRegion(&options, tracked = libmv_trackRegion(&options,
reference_search_area, reference_search_area,
reference_search_area_width, reference_search_area_width,
@ -595,6 +596,10 @@ static bool configure_and_run_tracker(ImBuf *destination_ibuf, MovieTrackingTrac
src_pixel_x, src_pixel_y, src_pixel_x, src_pixel_y,
&result, &result,
dst_pixel_x, dst_pixel_y); dst_pixel_x, dst_pixel_y);
#else
tracked = true;
#endif
MEM_freeN(patch_new); MEM_freeN(patch_new);
return tracked; return tracked;