X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=gamma_compression_effect.h;h=9577e020954461ff5fb6e1ee2c1145d115a5f1a9;hp=4c77b4c2cb2268af48f662b321cdfe4e2972a68f;hb=f8e636666b3d36f97b125bc1a0f0f582c5026c7f;hpb=e8650c7b7814c5beef59059b8acac3e5e7b8ddc6

diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index 4c77b4c..9577e02 100644
--- a/gamma_compression_effect.h
+++ b/gamma_compression_effect.h
@@ -1,27 +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_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)