Give the alpha enums somewhat better/more consistent names, and shuffle them around...

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index 1820eafda24c56248fcaa80b3af73caa7172d507..24a3fcad90347c545c093884dba809488ea6a317 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,13 +1,17 @@
 #ifndef _FLAT_INPUT_H
 #define _FLAT_INPUT_H 1
 
+#include <assert.h>
+
 #include "input.h"
+#include "init.h"
 
 // A FlatInput is the normal, “classic” case of an input, where everything
 // comes from a single 2D array with chunky pixels.
 class FlatInput : public Input {
 public:
        FlatInput(ImageFormat format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height);
+       ~FlatInput();
 
        virtual std::string effect_type_id() const { return "FlatInput"; }
 
@@ -16,10 +20,27 @@ public:
        // mipmap generation) at that point.
        void finalize();
 
-       // TODO: Check that we actually have the required extension.
        virtual bool can_output_linear_gamma() const {
-               return (image_format.gamma_curve == GAMMA_LINEAR ||
-                       image_format.gamma_curve == GAMMA_sRGB);
+               return (movit_srgb_textures_supported &&
+                       type == GL_UNSIGNED_BYTE &&
+                       (image_format.gamma_curve == GAMMA_LINEAR ||
+                        image_format.gamma_curve == GAMMA_sRGB));
+       }
+       virtual AlphaHandling alpha_handling() const {
+               switch (pixel_format) {
+               case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
+               case FORMAT_BGRA_PREMULTIPLIED_ALPHA:
+                       return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
+               case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
+               case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
+                       return OUTPUT_POSTMULTIPLIED_ALPHA;
+               case FORMAT_RGB:
+               case FORMAT_BGR:
+               case FORMAT_GRAYSCALE:
+                       return OUTPUT_BLANK_ALPHA;
+               default:
+                       assert(false);
+               }
        }
 
        std::string output_fragment_shader();
@@ -29,7 +50,7 @@ public:
 
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
-       ColorSpace get_color_space() const { return image_format.color_space; }
+       Colorspace get_color_space() const { return image_format.color_space; }
        GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
 
        // Tells the input where to fetch the actual pixel data. Note that if you change