Add proper formats for sRGB without alpha.

[movit] / gamma_compression_effect.h

diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index f34bca02eb76f51c633b237a789d9f5f18e418e3..ee3985f9fa03c807b2928dac5176e9b0baf58eff 100644 (file)
--- 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:
@@ -24,6 +26,7 @@ private:
 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; }
 
@@ -33,7 +36,8 @@ public:
 
 private:
        GammaCurve destination_curve;
-       float compression_curve[COMPRESSION_CURVE_SIZE];
 };
 
-#endif // !defined(_GAMMA_COMPRESSION_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_GAMMA_COMPRESSION_EFFECT_H)