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 cc65e4fa48924022cf5f3d05e70693cd06809b36..92f05171cd4d84ff08ad802cbef89138401c5d48 100644 (file)
--- a/gamma_expansion_effect.h
+++ b/gamma_expansion_effect.h
@@ -1,19 +1,20 @@
-#ifndef _GAMMA_EXPANSION_EFFECT_H 
-#define _GAMMA_EXPANSION_EFFECT_H 1
+#ifndef _MOVIT_GAMMA_EXPANSION_EFFECT_H 
+#define _MOVIT_GAMMA_EXPANSION_EFFECT_H 1
 
 // 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 and Rec. 601/709.
+// 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>
 
 #include "effect.h"
 #include "image_format.h"
 
-#define EXPANSION_CURVE_SIZE 256
-
 class GammaExpansionEffect : public Effect {
 private:
        // Should not be instantiated by end users.
@@ -23,6 +24,7 @@ private:
 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; }
@@ -33,7 +35,6 @@ public:
 
 private:
        GammaCurve source_curve;
-       float expansion_curve[EXPANSION_CURVE_SIZE];
 };
 
-#endif // !defined(_GAMMA_EXPANSION_EFFECT_H)
+#endif // !defined(_MOVIT_GAMMA_EXPANSION_EFFECT_H)