[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42898] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Fix #29688: Timecode is not used in tracking
Sergey Sharybin
sergey.vfx at gmail.com
Tue Dec 27 11:52:23 CET 2011
Revision: 42898
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42898
Author: nazgul
Date: 2011-12-27 10:52:23 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Fix #29688: Timecode is not used in tracking
Use proper timecode flags sending to BKE_movieclip_get_ibuf_flag function,
so now frames for tracking would be full-resolution but calculated using
timecode defined in th interface,
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/tracking.c
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2011-12-27 10:51:01 UTC (rev 42897)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2011-12-27 10:52:23 UTC (rev 42898)
@@ -730,6 +730,7 @@
typedef struct MovieTrackingContext {
MovieClipUser user;
MovieClip *clip;
+ int clip_flag;
int first_time, frames;
@@ -830,7 +831,20 @@
}
context->clip= clip;
+
+ /* store needed clip flags passing to get_buffer functions
+ * - MCLIP_USE_PROXY is needed to because timecode affects on movie clip
+ * only in case Proxy/Timecode flag is set, so store this flag to use
+ * timecodes properly but reset render size to SIZE_FULL so correct resolution
+ * would be used for images
+ * - MCLIP_USE_PROXY_CUSTOM_DIR is needed because proxy/timecode files might
+ * be stored in a different location
+ * ignore all the rest pssible flags for now */
+ context->clip_flag= clip->flag & (MCLIP_USE_PROXY|MCLIP_USE_PROXY_CUSTOM_DIR);
+
context->user= *user;
+ context->user.render_size= 0;
+ context->user.render_flag= MCLIP_PROXY_RENDER_SIZE_FULL;
if(!sequence)
BLI_begin_threaded_malloc();
@@ -1044,7 +1058,7 @@
user.framenr= framenr;
- ibuf= BKE_movieclip_get_ibuf_flag(context->clip, &user, 0);
+ ibuf= BKE_movieclip_get_ibuf_flag(context->clip, &user, context->clip_flag);
return ibuf;
}
@@ -1148,7 +1162,7 @@
if(context->backwards) context->user.framenr--;
else context->user.framenr++;
- ibuf_new= BKE_movieclip_get_ibuf_flag(context->clip, &context->user, 0);
+ ibuf_new= BKE_movieclip_get_ibuf_flag(context->clip, &context->user, context->clip_flag);
if(!ibuf_new)
return 0;
More information about the Bf-blender-cvs
mailing list