Loosen up a bound in ResampleEffectTest a bit.

[movit] / overlay_effect.h

diff --git a/overlay_effect.h b/overlay_effect.h
index d26d9175110ca636890e5c03084a98a7e747560f..29c09416ddea3f79aaf3ee733870ff66468f0b1f 100644 (file)
--- a/overlay_effect.h
+++ b/overlay_effect.h
@@ -1,5 +1,5 @@
-#ifndef _OVERLAY_EFFECT_H
-#define _OVERLAY_EFFECT_H 1
+#ifndef _MOVIT_OVERLAY_EFFECT_H
+#define _MOVIT_OVERLAY_EFFECT_H 1
 
 // Put one image on top of another, using alpha where appropriate.
 // (If both images are the same aspect and the top image has alpha=1.0
@@ -10,21 +10,35 @@
 //
 // The first input is the bottom, and the second is the top.
 
+#include <string>
+
 #include "effect.h"
 
+namespace movit {
+
 class OverlayEffect : public Effect {
 public:
        OverlayEffect();
-       virtual std::string effect_type_id() const { return "OverlayEffect"; }
-       std::string output_fragment_shader();
+       std::string effect_type_id() const override { return "OverlayEffect"; }
+       std::string output_fragment_shader() override;
 
-       virtual bool needs_srgb_primaries() const { return false; }
-       virtual unsigned num_inputs() const { return 2; }
+       bool needs_srgb_primaries() const override { return false; }
+       unsigned num_inputs() const override { return 2; }
+       bool strong_one_to_one_sampling() const override { return true; }
 
-       // Actually, if either image has blank alpha, our output will have
-       // blank alpha, too. However, understanding that would require changes
+       // Actually, if _either_ image has blank alpha, our output will have
+       // blank alpha, too (this only tells the framework that having _both_
+       // images with blank alpha would result in blank alpha).
+       // However, understanding that would require changes
        // to EffectChain, so postpone that optimization for later.
-       virtual AlphaHandling alpha_handling() const { return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA; }
+       AlphaHandling alpha_handling() const override { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
+
+private:
+       // If true, overlays input1 on top of input2 instead of vice versa.
+       // Must be set before finalize.
+       bool swap_inputs;
 };
 
-#endif // !defined(_OVERLAY_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_OVERLAY_EFFECT_H)