Mark ResampleEffect as not one-to-one sampling.

[movit] / padding_effect.cpp

diff --git a/padding_effect.cpp b/padding_effect.cpp
index a70025d015475f885a9841d96e40c08fe3ac762e..d8ed95212c66d7d797e1bce748362fe54f0f03c8 100644 (file)
--- a/padding_effect.cpp
+++ b/padding_effect.cpp
@@ -1,4 +1,4 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 
 #include "effect_util.h"
@@ -14,15 +14,13 @@ PaddingEffect::PaddingEffect()
          output_width(1280),
          output_height(720),
          top(0),
-         left(0),
-         pad_from_bottom(0)
+         left(0)
 {
        register_vec4("border_color", (float *)&border_color);
        register_int("width", &output_width);
        register_int("height", &output_height);
        register_float("top", &top);
        register_float("left", &left);
-       register_int("pad_from_bottom", &pad_from_bottom);
 }
 
 string PaddingEffect::output_fragment_shader()
@@ -34,13 +32,10 @@ void PaddingEffect::set_gl_state(GLuint glsl_program_num, const string &prefix,
 {
        Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
-       float offset[2];
-       offset[0] = left / output_width;
-       if (pad_from_bottom) {
-               offset[1] = top / output_height;
-       } else {
-               offset[1] = (output_height - input_height - top) / output_height;
-       }
+       float offset[2] = {
+               left / output_width,
+               (output_height - input_height - top) / output_height
+       };
        set_uniform_vec2(glsl_program_num, prefix, "offset", offset);
 
        float scale[2] = {
@@ -138,4 +133,25 @@ void PaddingEffect::inform_input_size(unsigned input_num, unsigned width, unsign
        input_height = height;
 }
 
+IntegralPaddingEffect::IntegralPaddingEffect() {}
+
+bool IntegralPaddingEffect::set_int(const std::string &key, int value)
+{
+       if (key == "top" || key == "left") {
+               return PaddingEffect::set_float(key, value);
+       } else {
+               return PaddingEffect::set_int(key, value);
+       }
+}
+
+bool IntegralPaddingEffect::set_float(const std::string &key, float value)
+{
+       if (key == "top" || key == "left") {
+               // These are removed as float parameters from this version.
+               return false;
+       } else {
+               return PaddingEffect::set_float(key, value);
+       }
+}
+
 }  // namespace movit