Remove the finalize() member function from Input.

[movit] / gamma_expansion_effect.h

diff --git a/gamma_expansion_effect.h b/gamma_expansion_effect.h
index f3e20c59ed95eba6030750cb04bf1846b37898fe..92f05171cd4d84ff08ad802cbef89138401c5d48 100644 (file)
--- a/gamma_expansion_effect.h
+++ b/gamma_expansion_effect.h
@@ -1,22 +1,40 @@
-#ifndef _GAMMA_EXPANSION_EFFECT_H 
-#define _GAMMA_EXPANSION_EFFECT_H 1
+#ifndef _MOVIT_GAMMA_EXPANSION_EFFECT_H 
+#define _MOVIT_GAMMA_EXPANSION_EFFECT_H 1
 
-#include "effect.h"
-#include "effect_chain.h"
+// An effect to convert the given gamma curve into linear light,
+// typically inserted by the framework automatically at the beginning
+// of the processing chain.
+//
+// Currently supports sRGB, Rec. 601/709 and Rec. 2020 (10- and 12-bit).
+// Note that Movit's internal formats generally do not have enough accuracy
+// for 12-bit input or output.
+
+#include <GL/glew.h>
+#include <string>
 
-#define EXPANSION_CURVE_SIZE 256
+#include "effect.h"
+#include "image_format.h"
 
 class GammaExpansionEffect : public Effect {
-public:
+private:
+       // Should not be instantiated by end users.
        GammaExpansionEffect();
+       friend class EffectChain;
+
+public:
+       virtual std::string effect_type_id() const { return "GammaExpansionEffect"; }
        std::string output_fragment_shader();
+       virtual void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
 
        virtual bool needs_linear_light() const { return false; }
        virtual bool needs_srgb_primaries() const { return false; }
 
+       // Actually processes its input in a nonlinear fashion,
+       // but does not touch alpha, and we are a special case anyway.
+       virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; }
+
 private:
        GammaCurve source_curve;
-       float expansion_curve[EXPANSION_CURVE_SIZE];
 };
 
-#endif // !defined(_GAMMA_EXPANSION_EFFECT_H)
+#endif // !defined(_MOVIT_GAMMA_EXPANSION_EFFECT_H)