X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=gamma_compression_effect.h;h=9094f1964acfd9e10e7fb9844b07965b5564c1be;hp=f34bca02eb76f51c633b237a789d9f5f18e418e3;hb=9527105a4958fa20f8d87d719a26b00cb000c0e8;hpb=37f56fcbe571b2322243f6de59494bf9e0cbb37a

diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index f34bca0..9094f19 100644
--- a/gamma_compression_effect.h
+++ b/gamma_compression_effect.h
@@ -1,19 +1,21 @@
-#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 <epoxy/gl.h>
 #include <string>
 
 #include "effect.h"
-#include "effect_chain.h"
 #include "image_format.h"
 
-#define COMPRESSION_CURVE_SIZE 4096
+namespace movit {
 
 class GammaCompressionEffect : public Effect {
 private:
@@ -22,18 +24,22 @@ private:
 	friend class EffectChain;
 
 public:
-	virtual std::string effect_type_id() const { return "GammaCompressionEffect"; }
-	std::string output_fragment_shader();
+	std::string effect_type_id() const override { return "GammaCompressionEffect"; }
+	std::string output_fragment_shader() override;
+	void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) override;
 
-	virtual bool needs_srgb_primaries() const { return false; }
+	bool needs_srgb_primaries() const override { return false; }
+	bool strong_one_to_one_sampling() const override { return true; }
 
 	// Actually needs postmultiplied input as well as outputting it.
 	// EffectChain will take care of that.
-	virtual AlphaHandling alpha_handling() const { return OUTPUT_POSTMULTIPLIED_ALPHA; }
+	AlphaHandling alpha_handling() const override { return OUTPUT_POSTMULTIPLIED_ALPHA; }
 
 private:
 	GammaCurve destination_curve;
-	float compression_curve[COMPRESSION_CURVE_SIZE];
+	float uniform_linear_scale, uniform_c[5], uniform_beta;
 };
 
-#endif // !defined(_GAMMA_COMPRESSION_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_GAMMA_COMPRESSION_EFFECT_H)