X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=gamma_expansion_effect.h;h=af0d0a908d0d9a1e10d809657db842ae5135453e;hp=ce999902f7be24b4ddace89ea12384cb7dbf5def;hb=453aa5c00561e4c73297f69e9f7c492a678e9699;hpb=b10c546f579c7ccb5939161e61a71cd18a3f9bbd

diff --git a/gamma_expansion_effect.h b/gamma_expansion_effect.h
index ce99990..af0d0a9 100644
--- a/gamma_expansion_effect.h
+++ b/gamma_expansion_effect.h
@@ -1,22 +1,29 @@
-#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 "effect.h"
-#include "effect_chain.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; }
@@ -27,7 +34,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)