X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=resample_effect.cpp;h=1722356b72ac0f02adcacb006bf27fbab5aa4088;hb=b63de2b092ee08427d4547164c3d4b1a5a1003e9;hp=30c40c4145fdd73903a7ce485d8ca75f7b28c783;hpb=532dc15e43ee8c26de0e9f13bc56d92b4a6b1379;p=movit

diff --git a/resample_effect.cpp b/resample_effect.cpp
index 30c40c4..1722356 100644
--- a/resample_effect.cpp
+++ b/resample_effect.cpp
@@ -9,6 +9,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <algorithm>
+#include <mutex>
 #include <Eigen/Sparse>
 #include <Eigen/SparseQR>
 #include <Eigen/OrderingMethods>
@@ -72,7 +73,7 @@ float lanczos_weight(float x)
 // You need to call lanczos_table_init_done before the first call to
 // lanczos_weight_cached.
 #define LANCZOS_TABLE_SIZE 2048
-bool lanczos_table_init_done = false;
+static once_flag lanczos_table_init_done;
 float lanczos_table[LANCZOS_TABLE_SIZE + 2];
 
 void init_lanczos_table()
@@ -80,7 +81,6 @@ void init_lanczos_table()
 	for (unsigned i = 0; i < LANCZOS_TABLE_SIZE + 2; ++i) {
 		lanczos_table[i] = lanczos_weight(float(i) * (LANCZOS_RADIUS / LANCZOS_TABLE_SIZE));
 	}
-	lanczos_table_init_done = true;
 }
 
 float lanczos_weight_cached(float x)
@@ -129,7 +129,7 @@ unsigned combine_samples(const Tap<float> *src, Tap<DestFloat> *dst, float num_s
 
 	for (unsigned i = 0, j = 0; i < num_src_samples; ++i, ++j) {
 		// Copy the sample directly; it will be overwritten later if we can combine.
-		if (dst != NULL) {
+		if (dst != nullptr) {
 			dst[j].weight = convert_float<float, DestFloat>(src[i].weight);
 			dst[j].pos = convert_float<float, DestFloat>(src[i].pos);
 		}
@@ -169,7 +169,7 @@ unsigned combine_samples(const Tap<float> *src, Tap<DestFloat> *dst, float num_s
 		}
 
 		// OK, we can combine this and the next sample.
-		if (dst != NULL) {
+		if (dst != nullptr) {
 			dst[j].weight = total_weight;
 			dst[j].pos = pos;
 		}
@@ -215,7 +215,7 @@ unsigned combine_many_samples(const Tap<float> *weights, unsigned src_size, unsi
 
 	unsigned max_samples_saved = UINT_MAX;
 	for (unsigned y = 0; y < dst_samples && max_samples_saved > 0; ++y) {
-		unsigned num_samples_saved = combine_samples<DestFloat>(weights + y * src_samples, NULL, num_subtexels, inv_num_subtexels, src_samples, max_samples_saved, pos1_pos2_diff, inv_pos1_pos2_diff);
+		unsigned num_samples_saved = combine_samples<DestFloat>(weights + y * src_samples, nullptr, num_subtexels, inv_num_subtexels, src_samples, max_samples_saved, pos1_pos2_diff, inv_pos1_pos2_diff);
 		max_samples_saved = min(max_samples_saved, num_samples_saved);
 	}
 
@@ -300,7 +300,8 @@ double compute_sum_sq_error(const Tap<float>* weights, unsigned num_weights,
 }  // namespace
 
 ResampleEffect::ResampleEffect()
-	: input_width(1280),
+	: owns_effects(true),
+	  input_width(1280),
 	  input_height(720),
 	  offset_x(0.0f), offset_y(0.0f),
 	  zoom_x(1.0f), zoom_y(1.0f),
@@ -312,12 +313,20 @@ ResampleEffect::ResampleEffect()
 	// The first blur pass will forward resolution information to us.
 	hpass = new SingleResamplePassEffect(this);
 	CHECK(hpass->set_int("direction", SingleResamplePassEffect::HORIZONTAL));
-	vpass = new SingleResamplePassEffect(NULL);
+	vpass = new SingleResamplePassEffect(nullptr);
 	CHECK(vpass->set_int("direction", SingleResamplePassEffect::VERTICAL));
 
 	update_size();
 }
 
+ResampleEffect::~ResampleEffect()
+{
+	if (owns_effects) {
+		delete hpass;
+		delete vpass;
+	}
+}
+
 void ResampleEffect::rewrite_graph(EffectChain *graph, Node *self)
 {
 	Node *hpass_node = graph->add_node(hpass);
@@ -326,6 +335,7 @@ void ResampleEffect::rewrite_graph(EffectChain *graph, Node *self)
 	graph->replace_receiver(self, hpass_node);
 	graph->replace_sender(self, vpass_node);
 	self->disabled = true;
+	owns_effects = false;
 } 
 
 // We get this information forwarded from the first blur pass,
@@ -458,11 +468,7 @@ SingleResamplePassEffect::SingleResamplePassEffect(ResampleEffect *parent)
 
 	glGenTextures(1, &texnum);
 
-	if (!lanczos_table_init_done) {
-		// Could in theory race between two threads if we are unlucky,
-		// but that is harmless, since they'll write the same data.
-		init_lanczos_table();
-	}
+	call_once(lanczos_table_init_done, init_lanczos_table);
 }
 
 SingleResamplePassEffect::~SingleResamplePassEffect()
@@ -554,10 +560,8 @@ void SingleResamplePassEffect::update_texture(GLuint glsl_program_num, const str
 
 ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset)
 {
-	if (!lanczos_table_init_done) {
-		// Only needed if run from outside ResampleEffect.
-		init_lanczos_table();
-	}
+	// Only needed if run from outside ResampleEffect.
+	call_once(lanczos_table_init_done, init_lanczos_table);
 
 	// For many resamplings (e.g. 640 -> 1280), we will end up with the same
 	// set of samples over and over again in a loop. Thus, we can compute only
@@ -658,7 +662,7 @@ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, f
 	const float max_error = 2.0f / (255.0f * 255.0f);
 	unique_ptr<Tap<fp16_int_t>[]> bilinear_weights_fp16;
 	int src_bilinear_samples = combine_many_samples(weights.get(), src_size, src_samples, dst_samples, &bilinear_weights_fp16);
-	unique_ptr<Tap<float>[]> bilinear_weights_fp32 = NULL;
+	unique_ptr<Tap<float>[]> bilinear_weights_fp32 = nullptr;
 	double max_sum_sq_error_fp16 = 0.0;
 	for (unsigned y = 0; y < dst_samples; ++y) {
 		double sum_sq_error_fp16 = compute_sum_sq_error(