X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=gamma_compression_effect.h;h=9577e020954461ff5fb6e1ee2c1145d115a5f1a9;hp=0155ee54b32fb28313d22785d91497e7f40a08c8;hb=2b6a8585772bf9ae742a2ee36144a0cdd5ba0524;hpb=b10c546f579c7ccb5939161e61a71cd18a3f9bbd

diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index 0155ee5..9577e02 100644
--- a/gamma_compression_effect.h
+++ b/gamma_compression_effect.h
@@ -1,32 +1,39 @@
-#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
 // 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 <GL/glew.h>
+#include <string>
 
-#define COMPRESSION_CURVE_SIZE 4096
+#include "effect.h"
+#include "image_format.h"
 
 class GammaCompressionEffect : public Effect {
-public:
+private:
+	// Should not be instantiated by end users.
 	GammaCompressionEffect();
+	friend class EffectChain;
+
+public:
 	virtual std::string effect_type_id() const { return "GammaCompressionEffect"; }
 	std::string output_fragment_shader();
+	virtual void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
 
 	virtual bool needs_srgb_primaries() const { return false; }
 
 	// 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)