X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=blur_effect.h;h=f531eb6e85aecb4a3305800e01051f510bb0a48b;hp=4af11a2b16a388ca6435e03b3d500eb2946039c3;hb=fe7a508885d19950c43e46dc60db675375f49ffb;hpb=5d4c0425579de66b3e2dd7d0095e890278f8efcf

diff --git a/blur_effect.h b/blur_effect.h
index 4af11a2..f531eb6 100644
--- a/blur_effect.h
+++ b/blur_effect.h
@@ -1,5 +1,5 @@
-#ifndef _BLUR_EFFECT_H
-#define _BLUR_EFFECT_H 1
+#ifndef _MOVIT_BLUR_EFFECT_H
+#define _MOVIT_BLUR_EFFECT_H 1
 
 // A separable 2D blur implemented by a combination of mipmap filtering
 // and convolution (essentially giving a convolution with a piecewise linear
@@ -8,9 +8,23 @@
 // Works in two passes; first horizontal, then vertical (BlurEffect,
 // which is what the user is intended to use, instantiates two copies of
 // SingleBlurPassEffect behind the scenes).
+//
+// The recommended number of taps is the default (16). Fewer will be faster
+// but uglier; a tradeoff that might be worth it as part of more complicated
+// effects. This can be set only before finalization, and must be an
+// even number.
+
+#include <epoxy/gl.h>
+#include <assert.h>
+#include <stddef.h>
+#include <string>
 
 #include "effect.h"
 
+namespace movit {
+
+class EffectChain;
+class Node;
 class SingleBlurPassEffect;
 
 class BlurEffect : public Effect {
@@ -24,7 +38,6 @@ public:
 	virtual bool needs_texture_bounce() const { return true; }
 	virtual bool needs_mipmaps() const { return true; }
 	virtual bool needs_srgb_primaries() const { return false; }
-	virtual AlphaHandling alpha_handling() const { return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA; }
 
 	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
@@ -37,10 +50,12 @@ public:
 
 	virtual void rewrite_graph(EffectChain *graph, Node *self);
 	virtual bool set_float(const std::string &key, float value);
+	virtual bool set_int(const std::string &key, int value);
 	
 private:
 	void update_radius();
-	
+
+	int num_taps;
 	float radius;
 	SingleBlurPassEffect *hpass, *vpass;
 	unsigned input_width, input_height;
@@ -58,6 +73,7 @@ public:
 	virtual bool needs_texture_bounce() const { return true; }
 	virtual bool needs_mipmaps() const { return true; }
 	virtual bool needs_srgb_primaries() const { return false; }
+	virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
 	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
 		if (parent != NULL) {
@@ -80,9 +96,12 @@ public:
 
 private:
 	BlurEffect *parent;
+	int num_taps;
 	float radius;
 	Direction direction;
 	int width, height, virtual_width, virtual_height;
 };
 
-#endif // !defined(_BLUR_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_BLUR_EFFECT_H)