Small refactoring in YCbCrInput.

[movit] / ycbcr_input.h

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 9f4e320cb6926f1f21d8fc98b2a9c66669ecb6da..4c7b3e9a2b6bd8282976f8a759c0061a16c2fb7b 100644 (file)
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -5,7 +5,7 @@
 // imprecisely, called “YUV”), which is typically what you get from a video decoder.
 // It upsamples planes as needed, using the default linear upsampling OpenGL gives you.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <string>
 
@@ -14,6 +14,8 @@
 #include "image_format.h"
 #include "input.h"
 
+namespace movit {
+
 class ResourcePool;
 
 struct YCbCrFormat {
@@ -44,11 +46,6 @@ public:
 
        virtual std::string effect_type_id() const { return "YCbCrInput"; }
 
-       // Create the texture itself. We cannot do this in the constructor,
-       // because we don't necessarily know all the settings (sRGB texture,
-       // mipmap generation) at that point.
-       void finalize();
-
        virtual bool can_output_linear_gamma() const { return false; }
        virtual AlphaHandling alpha_handling() const { return OUTPUT_BLANK_ALPHA; }
 
@@ -61,6 +58,7 @@ public:
        unsigned get_height() const { return height; }
        Colorspace get_color_space() const { return image_format.color_space; }
        GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
+       virtual bool can_supply_mipmaps() const { return false; }
 
        // Tells the input where to fetch the actual pixel data. Note that if you change
        // this data, you must either call set_pixel_data() again (using the same pointer
@@ -85,6 +83,7 @@ public:
        void set_pitch(unsigned channel, unsigned pitch) {
                assert(channel >= 0 && channel < 3);
                this->pitch[channel] = pitch;
+               invalidate_pixel_data();
        }
 
        virtual void inform_added(EffectChain *chain)
@@ -92,13 +91,12 @@ public:
                resource_pool = chain->get_resource_pool();
        }
 
+       bool set_int(const std::string& key, int value);
+
 private:
        ImageFormat image_format;
        YCbCrFormat ycbcr_format;
        GLuint pbos[3], texture_num[3];
-       bool finalized;
-
-       int needs_mipmaps;
 
        unsigned width, height, widths[3], heights[3];
        const unsigned char *pixel_data[3];
@@ -106,4 +104,6 @@ private:
        ResourcePool *resource_pool;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_YCBCR_INPUT_H)