[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55459] trunk/blender/source/blender: Tweaks to movie clip prefetching after discussion with Sebastian

Sergey Sharybin sergey.vfx at gmail.com
Thu Mar 21 08:47:39 CET 2013


Revision: 55459
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55459
Author:   nazgul
Date:     2013-03-21 07:47:38 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Tweaks to movie clip prefetching after discussion with Sebastian

Don't use sequencer's Frames Prefetch option and rather fill the
whole cache with frames.

Since movie clip is not "classical" prefetcher (it doesn't do
anything while playing back) and main purpose is to speed up
reading for further tracking and so, such a change seems logical.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_clip/clip_editor.c
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c	2013-03-21 06:11:16 UTC (rev 55458)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c	2013-03-21 07:47:38 UTC (rev 55459)
@@ -1040,7 +1040,7 @@
 	int end_frame;
 
 	/* check whether all the frames from prefetch range are cached */
-	end_frame = min_ii(sc->user.framenr + U.prefetchframes - 1, EFRA);
+	end_frame = EFRA;
 
 	if (clip->len)
 		end_frame = min_ii(end_frame, clip->len);
@@ -1059,10 +1059,6 @@
 	if (clip->prefetch_ok)
 		return true;
 
-	/* prefetch is disabled in user preferences */
-	if (U.prefetchframes == 0)
-		return true;
-
 	clip_len = BKE_movieclip_get_duration(clip);
 
 	/* check whether all the frames from prefetch range are cached */

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2013-03-21 06:11:16 UTC (rev 55458)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2013-03-21 07:47:38 UTC (rev 55459)
@@ -3431,7 +3431,7 @@
 	prop = RNA_def_property(srna, "prefetch_frames", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "prefetchframes");
 	RNA_def_property_range(prop, 0, 500);
-	RNA_def_property_ui_text(prop, "Prefetch Frames", "Number of frames to render ahead during playback");
+	RNA_def_property_ui_text(prop, "Prefetch Frames", "Number of frames to render ahead during playback (sequencer only)");
 
 	prop = RNA_def_property(srna, "memory_cache_limit", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "memcachelimit");




More information about the Bf-blender-cvs mailing list