X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=gamma_expansion_effect.h;h=9565a3b0e4d5d0654bb1d6f197067e4a6d88af3e;hp=cc65e4fa48924022cf5f3d05e70693cd06809b36;hb=HEAD;hpb=ad66f9714e4a36008c341355700272a52484a785

diff --git a/gamma_expansion_effect.h b/gamma_expansion_effect.h
index cc65e4f..9565a3b 100644
--- a/gamma_expansion_effect.h
+++ b/gamma_expansion_effect.h
@@ -1,18 +1,21 @@
-#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 <epoxy/gl.h>
 #include <string>
 
 #include "effect.h"
 #include "image_format.h"
 
-#define EXPANSION_CURVE_SIZE 256
+namespace movit {
 
 class GammaExpansionEffect : public Effect {
 private:
@@ -21,19 +24,23 @@ private:
 	friend class EffectChain;
 
 public:
-	virtual std::string effect_type_id() const { return "GammaExpansionEffect"; }
-	std::string output_fragment_shader();
+	std::string effect_type_id() const override { return "GammaExpansionEffect"; }
+	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_linear_light() const { return false; }
-	virtual bool needs_srgb_primaries() const { return false; }
+	bool needs_linear_light() const override { return false; }
+	bool needs_srgb_primaries() const override { return false; }
+	bool strong_one_to_one_sampling() const override { return true; }
 
 	// Actually processes its input in a nonlinear fashion,
 	// but does not touch alpha, and we are a special case anyway.
-	virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; }
+	AlphaHandling alpha_handling() const override { return DONT_CARE_ALPHA_TYPE; }
 
 private:
 	GammaCurve source_curve;
-	float expansion_curve[EXPANSION_CURVE_SIZE];
+	float uniform_linear_scale, uniform_c[5], uniform_beta;
 };
 
-#endif // !defined(_GAMMA_EXPANSION_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_GAMMA_EXPANSION_EFFECT_H)