[gimp/gimp-2-10] app: use longer iteration inteval (= bigger chunks) when applyng an op



commit fc5a641d2e2fdcafcfd677f143059eb3c313098e
Author: Ell <ell_se yahoo com>
Date:   Sun Jul 28 12:00:56 2019 +0300

    app: use longer iteration inteval (= bigger chunks) when applyng an op
    
    In gimp_gegl_apply_[cached_]operation(), use a longer iteration
    interval (resulying in bigger chunks) when processing the op, than
    the iteration interval used for rendering the projection.  In
    particular, use an even longer interval when processing area
    filters, since their may be particularly sensitive to the chunk
    size (see, for example, issue #3711).  Likewise, use the asme
    longer interval when not showing progress indication, since we
    don't need to stay responsive in this case (but don't avoid
    chunking altogether, to reduce the space required for intermediate
    results).
    
    This allows us to process an op faster when committing a filter,
    while still remaining responsive (if overall slower) during
    preview.
    
    (cherry picked from commit 5a500b4a1292d999eace7b3008368ef1c2b97aad)

 app/gegl/gimp-gegl-apply-operation.c | 45 ++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)
---
diff --git a/app/gegl/gimp-gegl-apply-operation.c b/app/gegl/gimp-gegl-apply-operation.c
index 737d083035..0e781926bb 100644
--- a/app/gegl/gimp-gegl-apply-operation.c
+++ b/app/gegl/gimp-gegl-apply-operation.c
@@ -39,6 +39,17 @@
 #include "gimp-gegl-utils.h"
 
 
+/* iteration interval when applying an operation interactively
+ * (with progress indication)
+ */
+#define APPLY_OPERATION_INTERACTIVE_INTERVAL    (1.0 / 8.0) /* seconds */
+
+/* iteration interval when applying an operation non-interactively
+ * (without progress indication)
+ */
+#define APPLY_OPERATION_NON_INTERACTIVE_INTERVAL 1.0 /* seconds */
+
+
 void
 gimp_gegl_apply_operation (GeglBuffer          *src_buffer,
                            GimpProgress        *progress,
@@ -81,6 +92,7 @@ gimp_gegl_apply_cached_operation (GeglBuffer          *src_buffer,
   GeglNode          *gegl;
   GeglNode          *effect;
   GeglNode          *dest_node;
+  GeglNode          *underlying_operation;
   GeglNode          *operation_src_node = NULL;
   GimpChunkIterator *iter;
   cairo_region_t    *region;
@@ -107,13 +119,11 @@ gimp_gegl_apply_cached_operation (GeglBuffer          *src_buffer,
 
   effect = operation;
 
+  underlying_operation = gimp_gegl_node_get_underlying_operation (operation);
+
   if (src_buffer)
     {
       GeglNode *src_node;
-      GeglNode *underlying_operation;
-
-      underlying_operation =
-        gimp_gegl_node_get_underlying_operation (operation);
 
       /* dup() because reading and writing the same buffer doesn't
        * generally work with non-point ops when working in chunks.
@@ -247,6 +257,33 @@ gimp_gegl_apply_cached_operation (GeglBuffer          *src_buffer,
 
   iter = gimp_chunk_iterator_new (region);
 
+  if (progress &&
+      /* avoid the interactive iteration interval for area filters (or meta ops
+       * that potentially involve area filters), since their processing speed
+       * tends to be sensitive to the chunk size.
+       */
+      ! gimp_gegl_node_is_area_filter_operation (underlying_operation))
+    {
+      /* we use a shorter iteration interval for interactive use (when there's
+       * progress indication), to stay responsive.
+       */
+      gimp_chunk_iterator_set_interval (
+        iter,
+        APPLY_OPERATION_INTERACTIVE_INTERVAL);
+    }
+  else
+    {
+      /* we use a longer iteration interval for non-interactive use (when
+       * there's no progress indication), or when applying an area filter (see
+       * above), as this generally allows for faster processing.  we don't
+       * avoid chunking altogether, since *some* chunking is still desirable to
+       * reduce the space needed for intermediate results.
+       */
+      gimp_chunk_iterator_set_interval (
+        iter,
+        APPLY_OPERATION_NON_INTERACTIVE_INTERVAL);
+    }
+
   while (gimp_chunk_iterator_next (iter))
     {
       GeglRectangle render_rect;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]