From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 10 Oct 2012 18:19:59 +0000 (+0200)
Subject: Only recompute deconvolution kernel when we need to.
X-Git-Tag: 1.0~326
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=ebe6d6ba984b2fb77b365aeacd1f30d4da59964b

Only recompute deconvolution kernel when we need to.
---

diff --git a/deconvolution_sharpen_effect.cpp b/deconvolution_sharpen_effect.cpp
index aa77dd8..29071c5 100644
--- a/deconvolution_sharpen_effect.cpp
+++ b/deconvolution_sharpen_effect.cpp
@@ -19,7 +19,12 @@ DeconvolutionSharpenEffect::DeconvolutionSharpenEffect()
 	  circle_radius(2.0f),
 	  gaussian_radius(0.0f),
 	  correlation(0.95f),
-	  noise(0.01f)
+	  noise(0.01f),
+	  last_R(-1),
+	  last_circle_radius(-1.0f),
+	  last_gaussian_radius(-1.0f),
+	  last_correlation(-1.0f),
+	  last_noise(-1.0f)
 {
 	register_int("matrix_size", &R);
 	register_float("circle_radius", &circle_radius);
@@ -32,6 +37,11 @@ std::string DeconvolutionSharpenEffect::output_fragment_shader()
 {
 	char buf[256];
 	sprintf(buf, "#define R %u\n", R);
+
+	assert(R >= 1);
+	assert(R <= 25);  // Same limit as Refocus.
+
+	last_R = R;
 	return buf + read_file("deconvolution_sharpen_effect.frag");
 }
 
@@ -238,13 +248,8 @@ void print_matrix(const MatrixXf &m)
 
 }  // namespace
 
-void DeconvolutionSharpenEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void DeconvolutionSharpenEffect::update_deconvolution_kernel()
 {
-	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
-
-	assert(R >= 1);
-	assert(R <= 25);  // Same limit as Refocus.
-
 	printf("circular blur radius: %5.3f\n", circle_radius);
 	printf("gaussian blur radius: %5.3f\n", gaussian_radius);
 	printf("correlation:          %5.3f\n", correlation);
@@ -402,7 +407,7 @@ void DeconvolutionSharpenEffect::set_gl_state(GLuint glsl_program_num, const std
 	assert(g_flattened.cols() == 1);
 
 	// Normalize and de-flatten the deconvolution matrix.
-	MatrixXf g(R + 1, R + 1);
+	g = MatrixXf(R + 1, R + 1);
 	sum = 0.0f;
 	for (int i = 0; i < g_flattened.rows(); ++i) {
 		int y = i / (R + 1);
@@ -421,6 +426,24 @@ void DeconvolutionSharpenEffect::set_gl_state(GLuint glsl_program_num, const std
 		g(y, x) = g_flattened(i) / sum;
 	}
 
+	last_circle_radius = circle_radius;
+	last_gaussian_radius = gaussian_radius;
+	last_correlation = correlation;
+	last_noise = noise;
+}
+
+void DeconvolutionSharpenEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+{
+	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
+
+	assert(R == last_R);
+
+	if (fabs(circle_radius - last_circle_radius) > 1e-3 ||
+	    fabs(gaussian_radius - last_gaussian_radius) > 1e-3 ||
+	    fabs(correlation - last_correlation) > 1e-3 ||
+	    fabs(noise - last_noise) > 1e-3) {
+		update_deconvolution_kernel();
+	}
 	// Now encode it as uniforms, and pass it on to the shader.
 	// (Actually the shader only uses about half of the elements.)
 	float samples[4 * (R + 1) * (R + 1)];
diff --git a/deconvolution_sharpen_effect.h b/deconvolution_sharpen_effect.h
index bc0bbd4..d0987f2 100644
--- a/deconvolution_sharpen_effect.h
+++ b/deconvolution_sharpen_effect.h
@@ -21,6 +21,8 @@
 
 #include "effect.h"
 
+#include <Eigen/Dense>
+
 class DeconvolutionSharpenEffect : public Effect {
 public:
 	DeconvolutionSharpenEffect();
@@ -51,6 +53,13 @@ private:
 	// (ie., blur is assumed to be a 2px circle), correlation = 0.95, and noise = 0.01.
 	// Note that once the radius starts going too far past R, you will get nonsensical results.
 	float circle_radius, gaussian_radius, correlation, noise;
+
+	// The deconvolution kernel, and the parameters last time we did an update.
+	Eigen::MatrixXf g;
+	int last_R;
+	float last_circle_radius, last_gaussian_radius, last_correlation, last_noise;
+	
+	void update_deconvolution_kernel();
 };
 
 #endif // !defined(_DECONVOLUTION_SHARPEN_EFFECT_H)