blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Compositor: add new node: Kuwahara filter #107015

Merged
Habib Gahbiche merged 22 commits from zazizizou/blender:com-kuwahara-filter-node into main 2023-06-08 16:14:51 +02:00
Conversation 14 Commits 22 Files Changed 19 +26 -44
3 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8805335270 - Show all commits

3
source/blender/compositor/nodes/COM_KuwaharaNode.cc
View File

@ -24,7 +24,8 @@ void KuwaharaNode::convert_to_operations(NodeConverter &converter,
converter.add_operation(operation);
converter.map_input_socket(get_input_socket(0), operation->get_input_socket(0));
converter.map_output_socket(get_output_socket(0), operation->get_output_socket());
} break;
break;
zazizizou marked this conversation as resolved Outdated
Sergey Sharybin commented 2023-06-07 12:12:32 +02:00
Outdated
Review
Copy Link

break should be inside of the block: https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Operators_and_Statements

`break` should be inside of the block: https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Operators_and_Statements
}
case CMP_NODE_KUWAHARA_ANISOTROPIC: {
/* Edge detection */

63
source/blender/compositor/operations/COM_KuwaharaAnisotropicOperation.cc
View File

@ -2,11 +2,9 @@
* Copyright 2023 Blender Foundation. */
#include "COM_KuwaharaAnisotropicOperation.h"
#include "BLI_math_base.hh"
#include "BLI_vector.hh"
extern "C" {
#include "IMB_colormanagement.h"
}
namespace blender::compositor {
@ -80,11 +78,16 @@ void KuwaharaAnisotropicOperation::execute_pixel_sampled(float output[4],
0 :
(lambda1 - lambda2) / (lambda1 + lambda2);
Vector<double> mean(n_div_);
Vector<double> sum(n_div_);
Vector<double> var(n_div_);
Vector<double> weight(n_div_);
for (int ch = 0; ch < 3; ch++) {
Vector<double> mean(n_div_, 0.0f);
Vector<double> sum(n_div_, 0.0f);
Vector<double> var(n_div_, 0.0f);
Vector<double> weight(n_div_, 0.0f);
mean.fill(0.0);
sum.fill(0.0);
var.fill(0.0);
weight.fill(0.0);
double sx = 1.0f / (strength + 1.0f);
double sy = (1.0f + strength) / 1.0f;
@ -98,22 +101,10 @@ void KuwaharaAnisotropicOperation::execute_pixel_sampled(float output[4],
/* Rotate and scale the kernel. This is the "anisotropic" part. */
int dx2 = int(sx * (cos(theta) * dx - sin(theta) * dy));
int dy2 = int(sy * (sin(theta) * dx + cos(theta) * dy));
int xx = x + dx2;
int yy = y + dy2;
/* Clamp image to avoid artefacts at borders. */
zazizizou marked this conversation as resolved Outdated
Sergey Sharybin commented 2023-05-11 12:32:26 +02:00
Outdated
Review
Copy Link

It might help making it an explicit const int height = this->get_height() outside of the loop. I am not sure compiler is smart enough to do it for us.
Although, also not suer it will give measurable time impact, but still feels like a good thing to do.

It might help making it an explicit `const int height = this->get_height()` outside of the loop. I am not sure compiler is smart enough to do it for us. Although, also not suer it will give measurable time impact, but still feels like a good thing to do.
if (xx < 0) {
xx = 0;
}
if (xx >= width) {
xx = width - 1;
}
if (yy < 0) {
yy = 0;
}
if (yy >= height) {
yy = height - 1;
}
const int xx = math::clamp(int(x) + dx2, 0, width - 1);
const int yy = math::clamp(int(y) + dy2, 0, height - 1);
const double ddx2 = double(dx2);
const double ddy2 = double(dy2);
@ -229,12 +220,16 @@ void KuwaharaAnisotropicOperation::update_memory_buffer_partial(MemoryBuffer *ou
0 :
(lambda1 - lambda2) / (lambda1 + lambda2);
for (int ch = 0; ch < 3; ch++) {
Vector<double> mean(n_div_);
Vector<double> sum(n_div_);
Vector<double> var(n_div_);
Vector<double> weight(n_div_);
Vector<double> mean(n_div_, 0.0f);
Vector<double> sum(n_div_, 0.0f);
Vector<double> var(n_div_, 0.0f);
Vector<double> weight(n_div_, 0.0f);
for (int ch = 0; ch < 3; ch++) {
mean.fill(0.0);
sum.fill(0.0);
var.fill(0.0);
weight.fill(0.0);
double sx = 1.0f / (strength + 1.0f);
zazizizou marked this conversation as resolved
Sergey Sharybin commented 2023-06-07 12:18:36 +02:00
Review
Copy Link

I've pretty much skipped the tiled implementation, but same note can be applied there.

I think we should move allocations to as high level as possible.

I've pretty much skipped the tiled implementation, but same note can be applied there. I think we should move allocations to as high level as possible.
double sy = (1.0f + strength) / 1.0f;
@ -248,22 +243,10 @@ void KuwaharaAnisotropicOperation::update_memory_buffer_partial(MemoryBuffer *ou
/* Rotate and scale the kernel. This is the "anisotropic" part. */
int dx2 = int(sx * (cos(theta) * dx - sin(theta) * dy));
int dy2 = int(sy * (sin(theta) * dx + cos(theta) * dy));
int xx = x + dx2;
int yy = y + dy2;
/* Clamp image to avoid artefacts at borders. */
if (xx < 0) {
xx = 0;
}
if (xx >= width) {
xx = width - 1;
}
if (yy < 0) {
yy = 0;
}
if (yy >= height) {
yy = height - 1;
}
const int xx = math::clamp(x + dx2, 0, width - 1);
const int yy = math::clamp(y + dy2, 0, height - 1);
const double ddx2 = double(dx2);
const double ddy2 = double(dy2);

4
source/blender/compositor/operations/COM_SMAAOperation.cc
View File

@ -3,12 +3,10 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "COM_SMAAOperation.h"
#include "BKE_node.hh"
#include "COM_SMAAAreaTexture.h"
extern "C" {
#include "BKE_node.hh"
#include "IMB_colormanagement.h"
}
namespace blender::compositor {