Add some room for future expansion in ResampleEffect, since I have something that...

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index f0112b3ca7c4abcec1ba73a6ce420f65b10162dd..7538a68c143e8bd29cdac1078b94bd456bf2c9f6 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -18,9 +18,11 @@
 #include <epoxy/gl.h>
 #include <assert.h>
 #include <stddef.h>
+#include <memory>
 #include <string>
 
 #include "effect.h"
+#include "fp16.h"
 
 namespace movit {
 
@@ -28,6 +30,22 @@ class EffectChain;
 class Node;
 class SingleResamplePassEffect;
 
+// Public so that it can be benchmarked externally.
+template<class T>
+struct Tap {
+       T weight;
+       T pos;
+};
+struct ScalingWeights {
+       unsigned src_bilinear_samples;
+       unsigned dst_samples, num_loops;
+
+       // Exactly one of these is set.
+       std::unique_ptr<Tap<fp16_int_t>[]> bilinear_weights_fp16;
+       std::unique_ptr<Tap<float>[]> bilinear_weights_fp32;
+};
+ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset);
+
 class ResampleEffect : public Effect {
 public:
        ResampleEffect();
@@ -53,9 +71,15 @@ 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;
+       float unused;
 };
 
 class SingleResamplePassEffect : public Effect {
@@ -80,6 +104,7 @@ public:
                }
        }
        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, unsigned *virtual_width, unsigned *virtual_height) const {
                *virtual_width = *width = this->output_width;
@@ -97,10 +122,20 @@ private:
        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;
+       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;
 };
 
 }  // namespace movit