[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55295] trunk/blender/source/blender/imbuf /intern/colormanagement.c: Skip allocating any display buffer and starting any threads

Sergey Sharybin sergey.vfx at gmail.com
Fri Mar 15 10:35:12 CET 2013


Revision: 55295
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55295
Author:   nazgul
Date:     2013-03-15 09:35:12 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
Skip allocating any display buffer and starting any threads
in case image buffer contains byte buffer only and it's
color space matches display space.

It was already check for this case, but it happened later
in color management routines, which is needed for saving
files, but not fast enough for realtime playback of 4K.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/colormanagement.c

Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c	2013-03-15 09:32:59 UTC (rev 55294)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2013-03-15 09:35:12 UTC (rev 55295)
@@ -1853,6 +1853,14 @@
 			applied_view_settings = &default_view_settings;
 		}
 
+		/* early out: no float buffer and byte buffer is already in display space,
+		 * let's just use if
+		 */
+		if (ibuf->rect_float == NULL && ibuf->rect_colorspace) {
+			if (is_ibuf_rect_in_display_space(ibuf, applied_view_settings, display_settings))
+				return (unsigned char *) ibuf->rect;
+		}
+
 		colormanage_view_settings_to_cache(&cache_view_settings, applied_view_settings);
 		colormanage_display_settings_to_cache(&cache_display_settings, display_settings);
 




More information about the Bf-blender-cvs mailing list