Implement GammaExpansionEffect using ALU ops instead of texture lookups.

[movit] / gamma_compression_effect.h

diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index 2744d2ddf65f809e96a301cdcb0e016e499c8f25..c494cd795b00ce5f5c20142a4ff4ea9ae879b7c1 100644 (file)
--- a/gamma_compression_effect.h
+++ b/gamma_compression_effect.h
@@ -1,5 +1,5 @@
-#ifndef _GAMMA_COMPRESSION_EFFECT_H 
-#define _GAMMA_COMPRESSION_EFFECT_H 1
+#ifndef _MOVIT_GAMMA_COMPRESSION_EFFECT_H 
+#define _MOVIT_GAMMA_COMPRESSION_EFFECT_H 1
 
 // An effect to convert linear light to the given gamma curve,
 // typically inserted by the framework automatically at the end
@@ -7,8 +7,10 @@
 //
 // Currently supports sRGB and Rec. 601/709.
 
+#include <string>
+
 #include "effect.h"
-#include "effect_chain.h"
+#include "image_format.h"
 
 #define COMPRESSION_CURVE_SIZE 4096
 
@@ -26,11 +28,11 @@ public:
 
        // Actually needs postmultiplied input as well as outputting it.
        // EffectChain will take care of that.
-       virtual AlphaHandling alpha_handling() const { return OUTPUT_ALPHA_POSTMULTIPLIED; }
+       virtual AlphaHandling alpha_handling() const { return OUTPUT_POSTMULTIPLIED_ALPHA; }
 
 private:
        GammaCurve destination_curve;
        float compression_curve[COMPRESSION_CURVE_SIZE];
 };
 
-#endif // !defined(_GAMMA_COMPRESSION_EFFECT_H)
+#endif // !defined(_MOVIT_GAMMA_COMPRESSION_EFFECT_H)