Rename .compute to .comp, to be in line with the Khronos reference compiler.

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index b06b09b57ae9af67f18e938396adc8ab8ddbdd0d..af6a79f0227ced59522e57ced1a865d7b11a9df0 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,9 +30,26 @@ 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();
+       ~ResampleEffect();
 
        virtual std::string effect_type_id() const { return "ResampleEffect"; }
 
@@ -55,17 +74,21 @@ private:
        void update_size();
        void update_offset_and_zoom();
        
+       // 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;
        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 {
 public:
-       // If parent is non-NULL, calls to inform_input_size will be forwarded,
+       // If parent is non-nullptr, calls to inform_input_size will be forwarded,
        // so that it can inform both passes about the right input and output
        // resolutions.
        SingleResamplePassEffect(ResampleEffect *parent);
@@ -80,7 +103,7 @@ public:
 
        virtual void inform_added(EffectChain *chain) { this->chain = chain; }
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
-               if (parent != NULL) {
+               if (parent != nullptr) {
                        parent->inform_input_size(input_num, width, height);
                }
        }
@@ -110,6 +133,7 @@ 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;