[Bf-blender-cvs] [1bf90d2b219] compositor-full-frame: Compositor: Full frame Filter node
Manuel Castilla
noreply at git.blender.org
Thu Aug 12 22:35:57 CEST 2021
Commit: 1bf90d2b219f77f5ec8e26de337e9036d3d9f6f6
Author: Manuel Castilla
Date: Thu Aug 12 14:58:13 2021 +0200
Branches: compositor-full-frame
https://developer.blender.org/rB1bf90d2b219f77f5ec8e26de337e9036d3d9f6f6
Compositor: Full frame Filter node
===================================================================
M source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc
M source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
M source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc
M source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
===================================================================
diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc
index 5ead300a368..9127a871b04 100644
--- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc
+++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc
@@ -95,4 +95,81 @@ void ConvolutionEdgeFilterOperation::executePixel(float output[4], int x, int y,
output[3] = MAX2(output[3], 0.0f);
}
+void ConvolutionEdgeFilterOperation::update_memory_buffer_partial(MemoryBuffer *output,
+ const rcti &area,
+ Span<MemoryBuffer *> inputs)
+{
+ const MemoryBuffer *image = inputs[IMAGE_INPUT_INDEX];
+ const int last_x = getWidth() - 1;
+ const int last_y = getHeight() - 1;
+ for (BuffersIterator<float> it = output->iterate_with(inputs, area); !it.is_end(); ++it) {
+ const int left_offset = (it.x == 0) ? 0 : -image->elem_stride;
+ const int right_offset = (it.x == last_x) ? 0 : image->elem_stride;
+ const int down_offset = (it.y == 0) ? 0 : -image->row_stride;
+ const int up_offset = (it.y == last_y) ? 0 : image->row_stride;
+
+ const float *center_color = it.in(IMAGE_INPUT_INDEX);
+ float res1[4] = {0};
+ float res2[4] = {0};
+
+ const float *color = center_color + down_offset + left_offset;
+ madd_v3_v3fl(res1, color, m_filter[0]);
+ copy_v3_v3(res2, res1);
+
+ color = center_color + down_offset;
+ madd_v3_v3fl(res1, color, m_filter[1]);
+ madd_v3_v3fl(res2, color, m_filter[3]);
+
+ color = center_color + down_offset + right_offset;
+ madd_v3_v3fl(res1, color, m_filter[2]);
+ madd_v3_v3fl(res2, color, m_filter[6]);
+
+ color = center_color + left_offset;
+ madd_v3_v3fl(res1, color, m_filter[3]);
+ madd_v3_v3fl(res2, color, m_filter[1]);
+
+ {
+ float rgb_filtered[3];
+ mul_v3_v3fl(rgb_filtered, center_color, m_filter[4]);
+ add_v3_v3(res1, rgb_filtered);
+ add_v3_v3(res2, rgb_filtered);
+ }
+
+ color = center_color + right_offset;
+ madd_v3_v3fl(res1, color, m_filter[5]);
+ madd_v3_v3fl(res2, color, m_filter[7]);
+
+ color = center_color + up_offset + left_offset;
+ madd_v3_v3fl(res1, color, m_filter[6]);
+ madd_v3_v3fl(res2, color, m_filter[2]);
+
+ color = center_color + up_offset;
+ madd_v3_v3fl(res1, color, m_filter[7]);
+ madd_v3_v3fl(res2, color, m_filter[5]);
+
+ {
+ color = center_color + up_offset + right_offset;
+ float rgb_filtered[3];
+ mul_v3_v3fl(rgb_filtered, color, m_filter[8]);
+ add_v3_v3(res1, rgb_filtered);
+ add_v3_v3(res2, rgb_filtered);
+ }
+
+ it.out[0] = sqrt(res1[0] * res1[0] + res2[0] * res2[0]);
+ it.out[1] = sqrt(res1[1] * res1[1] + res2[1] * res2[1]);
+ it.out[2] = sqrt(res1[2] * res1[2] + res2[2] * res2[2]);
+
+ const float factor = *it.in(FACTOR_INPUT_INDEX);
+ const float m_factor = 1.0f - factor;
+ it.out[0] = it.out[0] * factor + center_color[0] * m_factor;
+ it.out[1] = it.out[1] * factor + center_color[1] * m_factor;
+ it.out[2] = it.out[2] * factor + center_color[2] * m_factor;
+
+ it.out[3] = center_color[3];
+
+ /* Make sure we don't return negative color. */
+ CLAMP4_MIN(it.out, 0.0f);
+ }
+}
+
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
index 319b424bd4a..bd38e27165a 100644
--- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
+++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
@@ -25,6 +25,10 @@ namespace blender::compositor {
class ConvolutionEdgeFilterOperation : public ConvolutionFilterOperation {
public:
void executePixel(float output[4], int x, int y, void *data) override;
+
+ void update_memory_buffer_partial(MemoryBuffer *output,
+ const rcti &area,
+ Span<MemoryBuffer *> inputs) override;
};
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc
index 72cbbf4283a..11a077229fd 100644
--- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc
+++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc
@@ -127,4 +127,62 @@ bool ConvolutionFilterOperation::determineDependingAreaOfInterest(
return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
}
+void ConvolutionFilterOperation::get_area_of_interest(const int input_idx,
+ const rcti &output_area,
+ rcti &r_input_area)
+{
+ switch (input_idx) {
+ case IMAGE_INPUT_INDEX: {
+ const int add_x = (m_filterWidth - 1) / 2 + 1;
+ const int add_y = (m_filterHeight - 1) / 2 + 1;
+ r_input_area.xmin = output_area.xmin - add_x;
+ r_input_area.xmax = output_area.xmax + add_x;
+ r_input_area.ymin = output_area.ymin - add_y;
+ r_input_area.ymax = output_area.ymax + add_y;
+ break;
+ }
+ case FACTOR_INPUT_INDEX: {
+ r_input_area = output_area;
+ break;
+ }
+ }
+}
+
+void ConvolutionFilterOperation::update_memory_buffer_partial(MemoryBuffer *output,
+ const rcti &area,
+ Span<MemoryBuffer *> inputs)
+{
+ const MemoryBuffer *image = inputs[IMAGE_INPUT_INDEX];
+ const int last_x = getWidth() - 1;
+ const int last_y = getHeight() - 1;
+ for (BuffersIterator<float> it = output->iterate_with(inputs, area); !it.is_end(); ++it) {
+ const int left_offset = (it.x == 0) ? 0 : -image->elem_stride;
+ const int right_offset = (it.x == last_x) ? 0 : image->elem_stride;
+ const int down_offset = (it.y == 0) ? 0 : -image->row_stride;
+ const int up_offset = (it.y == last_y) ? 0 : image->row_stride;
+
+ const float *center_color = it.in(IMAGE_INPUT_INDEX);
+ zero_v4(it.out);
+ madd_v4_v4fl(it.out, center_color + down_offset + left_offset, m_filter[0]);
+ madd_v4_v4fl(it.out, center_color + down_offset, m_filter[1]);
+ madd_v4_v4fl(it.out, center_color + down_offset + right_offset, m_filter[2]);
+ madd_v4_v4fl(it.out, center_color + left_offset, m_filter[3]);
+ madd_v4_v4fl(it.out, center_color, m_filter[4]);
+ madd_v4_v4fl(it.out, center_color + right_offset, m_filter[5]);
+ madd_v4_v4fl(it.out, center_color + up_offset + left_offset, m_filter[6]);
+ madd_v4_v4fl(it.out, center_color + up_offset, m_filter[7]);
+ madd_v4_v4fl(it.out, center_color + up_offset + right_offset, m_filter[8]);
+
+ const float factor = *it.in(FACTOR_INPUT_INDEX);
+ const float m_factor = 1.0f - factor;
+ it.out[0] = it.out[0] * factor + center_color[0] * m_factor;
+ it.out[1] = it.out[1] * factor + center_color[1] * m_factor;
+ it.out[2] = it.out[2] * factor + center_color[2] * m_factor;
+ it.out[3] = it.out[3] * factor + center_color[3] * m_factor;
+
+ /* Make sure we don't return negative color. */
+ CLAMP4_MIN(it.out, 0.0f);
+ }
+}
+
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
index 16dee502929..7e12c7faa5c 100644
--- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
+++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
@@ -18,11 +18,15 @@
#pragma once
-#include "COM_NodeOperation.h"
+#include "COM_MultiThreadedOperation.h"
namespace blender::compositor {
-class ConvolutionFilterOperation : public NodeOperation {
+class ConvolutionFilterOperation : public MultiThreadedOperation {
+ protected:
+ static constexpr int IMAGE_INPUT_INDEX = 0;
+ static constexpr int FACTOR_INPUT_INDEX = 1;
+
private:
int m_filterWidth;
int m_filterHeight;
@@ -43,6 +47,11 @@ class ConvolutionFilterOperation : public NodeOperation {
void initExecution() override;
void deinitExecution() override;
+
+ void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) final;
+ virtual void update_memory_buffer_partial(MemoryBuffer *output,
+ const rcti &area,
+ Span<MemoryBuffer *> inputs) override;
};
} // namespace blender::compositor
More information about the Bf-blender-cvs
mailing list