Merge branch 'master' into epoxy

[movit] / overlay_effect.h

diff --git a/overlay_effect.h b/overlay_effect.h
index 64224afe572b9a7e738af3ab0a72fe8bb61a15ea..489d8d78168c449ccf8bf6e35c86182732f1a04f 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();
@@ -21,10 +25,14 @@ public:
        virtual bool needs_srgb_primaries() const { return false; }
        virtual unsigned num_inputs() const { return 2; }
 
-       // 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_ALPHA_PREMULTIPLIED; }
+       virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 };
 
-#endif // !defined(_OVERLAY_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_OVERLAY_EFFECT_H)