X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.h;h=cf5f3bbd74e83aedccfa939dd5c82ad3d8919e13;hp=af6a79f0227ced59522e57ced1a865d7b11a9df0;hb=b90558ce2296b46758be80d447f36bb0ed1be70a;hpb=34509233ba5b71c05f1b85f6fbeadb46719a98f4 diff --git a/resample_effect.h b/resample_effect.h index af6a79f..cf5f3bb 100644 --- a/resample_effect.h +++ b/resample_effect.h @@ -44,31 +44,43 @@ struct ScalingWeights { std::unique_ptr[]> bilinear_weights_fp16; std::unique_ptr[]> bilinear_weights_fp32; }; -ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset); +ScalingWeights calculate_bilinear_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset); + +// A simple manager for support data stored in a 2D texture. +// Consider moving it to a shared location of more classes +// should need similar functionality. +class Support2DTexture { +public: + Support2DTexture(); + ~Support2DTexture(); + + void update(GLint width, GLint height, GLenum internal_format, GLenum format, GLenum type, const GLvoid * data); + GLint get_texnum() const { return texnum; } + +private: + GLuint texnum = 0; + GLint last_texture_width = -1, last_texture_height = -1; + GLenum last_texture_internal_format = GL_INVALID_ENUM; +}; class ResampleEffect : public Effect { public: ResampleEffect(); ~ResampleEffect(); - virtual std::string effect_type_id() const { return "ResampleEffect"; } + std::string effect_type_id() const override { return "ResampleEffect"; } - // We want this for the same reason as ResizeEffect; we could end up scaling - // down quite a lot. - virtual bool needs_texture_bounce() const { return true; } - virtual bool needs_srgb_primaries() const { return false; } + void inform_input_size(unsigned input_num, unsigned width, unsigned height) override; - virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height); - - virtual std::string output_fragment_shader() { + std::string output_fragment_shader() override { assert(false); } - virtual 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 { assert(false); } - virtual void rewrite_graph(EffectChain *graph, Node *self); - virtual bool set_float(const std::string &key, float value); + void rewrite_graph(EffectChain *graph, Node *self) override; + bool set_float(const std::string &key, float value) override; private: void update_size(); @@ -76,14 +88,13 @@ private: // Both of these are owned by us if owns_effects is true (before finalize()), // and otherwise owned by the EffectChain. - bool owns_effects; - SingleResamplePassEffect *hpass, *vpass; + std::unique_ptr hpass_owner, vpass_owner; + SingleResamplePassEffect *hpass = nullptr, *vpass = nullptr; int input_width, input_height, output_width, output_height; float offset_x, offset_y; float zoom_x, zoom_y; float zoom_center_x, zoom_center_y; - float unused; }; class SingleResamplePassEffect : public Effect { @@ -93,29 +104,33 @@ public: // resolutions. SingleResamplePassEffect(ResampleEffect *parent); ~SingleResamplePassEffect(); - virtual std::string effect_type_id() const { return "SingleResamplePassEffect"; } + std::string effect_type_id() const override { return "SingleResamplePassEffect"; } + + std::string output_fragment_shader() override; - std::string output_fragment_shader(); + bool needs_texture_bounce() const override { return true; } + bool needs_srgb_primaries() const override { return false; } + AlphaHandling alpha_handling() const override { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; } - virtual bool needs_texture_bounce() const { return true; } - virtual bool needs_srgb_primaries() const { return false; } - virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; } + // We specifically do not want mipmaps on the input texture; + // they break minification. + MipmapRequirements needs_mipmaps() const override { return CANNOT_ACCEPT_MIPMAPS; } - virtual void inform_added(EffectChain *chain) { this->chain = chain; } - virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) { + void inform_added(EffectChain *chain) override { this->chain = chain; } + void inform_input_size(unsigned input_num, unsigned width, unsigned height) override { if (parent != nullptr) { parent->inform_input_size(input_num, width, height); } } - virtual bool changes_output_size() const { return true; } - virtual bool sets_virtual_output_size() const { return false; } + bool changes_output_size() const override { return true; } + bool sets_virtual_output_size() const override { return false; } - virtual void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const { + void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const override { *virtual_width = *width = this->output_width; *virtual_height = *height = this->output_height; } - 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; enum Direction { HORIZONTAL = 0, VERTICAL = 1 }; @@ -125,7 +140,6 @@ private: ResampleEffect *parent; EffectChain *chain; Direction direction; - GLuint texnum; GLint uniform_sample_tex; float uniform_num_loops, uniform_slice_height, uniform_sample_x_scale, uniform_sample_x_offset; float uniform_whole_pixel_offset; @@ -133,13 +147,11 @@ private: int input_width, input_height, output_width, output_height; float offset, zoom; - float unused; int last_input_width, last_input_height, last_output_width, last_output_height; float last_offset, last_zoom; int src_bilinear_samples, num_loops; float slice_height; - int last_texture_width, last_texture_height; - GLuint last_texture_internal_format; + Support2DTexture tex; }; } // namespace movit