Remove C++11 dependency from ResampleEffect.

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index 73dfc210e9732388e193ed2dcd0eb6cdb31d50a8..7cd613fb34950d1620bceb257ce66cacd69536a8 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -21,6 +21,7 @@
 #include <string>
 
 #include "effect.h"
+#include "fp16.h"
 
 namespace movit {
 
@@ -28,6 +29,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.
+       Tap<fp16_int_t> *bilinear_weights_fp16;
+       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();
@@ -61,6 +78,7 @@ private:
        float offset_x, offset_y;
        float zoom_x, zoom_y;
        float zoom_center_x, zoom_center_y;
+       float unused;
 };
 
 class SingleResamplePassEffect : public Effect {
@@ -103,8 +121,14 @@ 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;