X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.h;h=5906a3c44ca41f499b17340e3fcc36fdaec80dfc;hp=7cd613fb34950d1620bceb257ce66cacd69536a8;hb=1c44926155efb721da02916f82af87d186a7fb57;hpb=8e9f58fec54a4c879035b214fd7411f6ff7b3a32

diff --git a/resample_effect.h b/resample_effect.h
index 7cd613f..5906a3c 100644
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -18,6 +18,7 @@
 #include <epoxy/gl.h>
 #include <assert.h>
 #include <stddef.h>
+#include <memory>
 #include <string>
 
 #include "effect.h"
@@ -40,14 +41,15 @@ struct ScalingWeights {
 	unsigned dst_samples, num_loops;
 
 	// Exactly one of these is set.
-	Tap<fp16_int_t> *bilinear_weights_fp16;
-	Tap<float> *bilinear_weights_fp32;
+	std::unique_ptr<Tap<fp16_int_t>[]> bilinear_weights_fp16;
+	std::unique_ptr<Tap<float>[]> bilinear_weights_fp32;
 };
 ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset);
 
 class ResampleEffect : public Effect {
 public:
 	ResampleEffect();
+	~ResampleEffect();
 
 	virtual std::string effect_type_id() const { return "ResampleEffect"; }
 
@@ -72,18 +74,20 @@ private:
 	void update_size();
 	void update_offset_and_zoom();
 	
+	// Both of these are owned by us if owns_effects is true (before finalize()),
+	// and otherwise owned by the EffectChain.
+	bool owns_effects;
 	SingleResamplePassEffect *hpass, *vpass;
 	int input_width, input_height, output_width, output_height;
 
 	float offset_x, offset_y;
 	float zoom_x, zoom_y;
 	float zoom_center_x, zoom_center_y;
-	float unused;
 };
 
 class SingleResamplePassEffect : public Effect {
 public:
-	// If parent is non-NULL, calls to inform_input_size will be forwarded,
+	// If parent is non-nullptr, calls to inform_input_size will be forwarded,
 	// so that it can inform both passes about the right input and output
 	// resolutions.
 	SingleResamplePassEffect(ResampleEffect *parent);
@@ -98,7 +102,7 @@ public:
 
 	virtual void inform_added(EffectChain *chain) { this->chain = chain; }
 	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
-		if (parent != NULL) {
+		if (parent != nullptr) {
 			parent->inform_input_size(input_num, width, height);
 		}
 	}
@@ -128,7 +132,6 @@ private:
 
 	int input_width, input_height, output_width, output_height;
 	float offset, zoom;
-	float unused;
 	int last_input_width, last_input_height, last_output_width, last_output_height;
 	float last_offset, last_zoom;
 	int src_bilinear_samples, num_loops;