Release Movit 1.3.2. (From a branch, since I do not want to break ABI compatibility...

[movit] / overlay_effect.h

diff --git a/overlay_effect.h b/overlay_effect.h
index 4c6d37a4fea6d9a95715031426eb7332fcf73346..40a6fff99e2a465f71cff654d8ae675495c08685 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,8 +10,12 @@
 //
 // 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();
@@ -20,6 +24,7 @@ public:
 
        virtual bool needs_srgb_primaries() const { return false; }
        virtual unsigned num_inputs() const { return 2; }
+       virtual bool one_to_one_sampling() const { return true; }
 
        // Actually, if _either_ image has blank alpha, our output will have
        // blank alpha, too (this only tells the framework that having _both_
@@ -27,6 +32,13 @@ public:
        // However, understanding that would require changes
        // to EffectChain, so postpone that optimization for later.
        virtual AlphaHandling alpha_handling() const { 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)