X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=eb9fff34fe8184132d01121272e8f8a0fa6c0926;hp=25b9091abc837baa699d5d36bc2c0b94253dc97a;hb=17a469f38066d783158e02c983f24396c9fb4a92;hpb=d4109eee4f38a13a7f8432755bc8b6bf02ceda46

diff --git a/flat_input.h b/flat_input.h
index 25b9091..eb9fff3 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -9,7 +9,6 @@
 #include "effect_chain.h"
 #include "fp16.h"
 #include "image_format.h"
-#include "init.h"
 #include "input.h"
 
 namespace movit {
@@ -23,21 +22,20 @@ public:
 	FlatInput(ImageFormat format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height);
 	~FlatInput();
 
-	virtual std::string effect_type_id() const { return "FlatInput"; }
+	std::string effect_type_id() const override { return "FlatInput"; }
 
-	virtual bool can_output_linear_gamma() const {
+	bool can_output_linear_gamma() const override {
 		// On desktop OpenGL, there's also GL_SLUMINANCE8 which could give us
 		// support for single-channel sRGB decoding, but it's not supported
 		// on GLES, and we're already actively rewriting single-channel inputs
 		// to GL_RED (even on desktop), so we stick to 3- and 4-channel inputs.
-		return (movit_srgb_textures_supported &&
-		        type == GL_UNSIGNED_BYTE &&
+		return (type == GL_UNSIGNED_BYTE &&
 			(pixel_format == FORMAT_RGB ||
 			 pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) &&
 		        (image_format.gamma_curve == GAMMA_LINEAR ||
 		         image_format.gamma_curve == GAMMA_sRGB));
 	}
-	virtual AlphaHandling alpha_handling() const {
+	AlphaHandling alpha_handling() const override {
 		switch (pixel_format) {
 		case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
 			return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
@@ -52,16 +50,16 @@ public:
 		}
 	}
 
-	std::string output_fragment_shader();
+	std::string output_fragment_shader() override;
 
 	// Uploads the texture if it has changed since last time.
-	void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num);
+	void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num) override;
 
-	unsigned get_width() const { return width; }
-	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 is_single_texture() const { return true; }
+	unsigned get_width() const override { return width; }
+	unsigned get_height() const override { return height; }
+	Colorspace get_color_space() const override { return image_format.color_space; }
+	GammaCurve get_gamma_curve() const override { return image_format.gamma_curve; }
+	bool is_single_texture() const override { return true; }
 
 	// 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
@@ -107,26 +105,70 @@ public:
 
 	void invalidate_pixel_data();
 
+	// Note: Sets pitch to width, so even if your pitch is unchanged,
+	// you will need to re-set it after this call.
+	void set_width(unsigned width)
+	{
+		assert(width != 0);
+		this->pitch = this->width = width;
+		invalidate_pixel_data();
+	}
+
+	void set_height(unsigned height)
+	{
+		assert(height != 0);
+		this->height = height;
+		invalidate_pixel_data();
+	}
+
 	void set_pitch(unsigned pitch) {
+		assert(pitch != 0);
 		this->pitch = pitch;
 		invalidate_pixel_data();
 	}
 
-	virtual void inform_added(EffectChain *chain)
+	// Tells the input to use the specific OpenGL texture as pixel data.
+	// This is useful if you want to share the same texture between multiple
+	// EffectChain instances, or if you somehow can get the data into a texture more
+	// efficiently than through a normal upload (e.g. a video codec decoding straight
+	// into a texture). Note that you are responsible for setting the right sampler
+	// parameters (e.g. clamp-to-edge) yourself, as well as generate any mipmaps
+	// if they are needed.
+	//
+	// NOTE: The input does not take ownership of this texture; you are responsible
+	// for releasing it yourself. In particular, if you call invalidate_pixel_data()
+	// or anything calling it, the texture will silently be removed from the input.
+	//
+	// NOTE: Doing this in a situation where can_output_linear_gamma() is true
+	// can yield unexpected results, as the downstream effect can expect the texture
+	// to be uploaded with the sRGB flag on.
+	void set_texture_num(GLuint texture_num)
+	{
+		possibly_release_texture();
+		this->texture_num = texture_num;
+		this->owns_texture = false;
+	}
+
+	void inform_added(EffectChain *chain) override
 	{
 		resource_pool = chain->get_resource_pool();
 	}
 
 private:
+	// Release the texture if we have any, and it is owned by us.
+	void possibly_release_texture();
+
 	ImageFormat image_format;
 	MovitPixelFormat pixel_format;
 	GLenum type;
 	GLuint pbo, texture_num;
 	int output_linear_gamma, needs_mipmaps;
 	unsigned width, height, pitch;
+	bool owns_texture;
 	const void *pixel_data;
 	ResourcePool *resource_pool;
 	bool fixup_swap_rb, fixup_red_to_grayscale;
+	GLint uniform_tex;
 };
 
 }  // namespace movit