Hard-assert on something that has bitten me too many times now.

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index 1424bbfd5b43de6e1da710d182516025d0de5553..b06b09b57ae9af67f18e938396adc8ab8ddbdd0d 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -1,5 +1,5 @@
-#ifndef _RESAMPLE_EFFECT_H
-#define _RESAMPLE_EFFECT_H 1
+#ifndef _MOVIT_RESAMPLE_EFFECT_H
+#define _MOVIT_RESAMPLE_EFFECT_H 1
 
 // High-quality image resizing, either up or down.
 //
@@ -15,8 +15,17 @@
 // which is what the user is intended to use, instantiates two copies of
 // SingleResamplePassEffect behind the scenes).
 
+#include <epoxy/gl.h>
+#include <assert.h>
+#include <stddef.h>
+#include <string>
+
 #include "effect.h"
 
+namespace movit {
+
+class EffectChain;
+class Node;
 class SingleResamplePassEffect;
 
 class ResampleEffect : public Effect {
@@ -44,9 +53,14 @@ public:
        
 private:
        void update_size();
+       void update_offset_and_zoom();
        
        SingleResamplePassEffect *hpass, *vpass;
        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;
 };
 
 class SingleResamplePassEffect : public Effect {
@@ -62,17 +76,20 @@ public:
 
        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; }
 
+       virtual void inform_added(EffectChain *chain) { this->chain = chain; }
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
                if (parent != NULL) {
                        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; }
 
-       virtual void get_output_size(unsigned *width, unsigned *height) const {
-               *width = this->output_width;
-               *height = this->output_height;
+       virtual void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const {
+               *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);
@@ -83,12 +100,24 @@ private:
        void update_texture(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
 
        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;
+       int uniform_num_samples;
+
        int input_width, input_height, output_width, output_height;
+       float offset, zoom;
        int last_input_width, last_input_height, last_output_width, last_output_height;
-       int src_samples, num_loops;
+       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;
 };
 
-#endif // !defined(_RESAMPLE_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_RESAMPLE_EFFECT_H)