]> git.sesse.net Git - nageru/blobdiff - flow.cpp
Also calculate beta_0 when calculating derivatives.
[nageru] / flow.cpp
index 74b0fd03375098891bd082fdc3a93779af8ada72..8250aa3a885e63c633988ad76c3015a142aa0767 100644 (file)
--- a/flow.cpp
+++ b/flow.cpp
@@ -15,6 +15,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include "util.h"
 
@@ -32,7 +33,7 @@ constexpr unsigned finest_level = 1;
 constexpr unsigned patch_size_pixels = 12;
 
 // Some global OpenGL objects.
-GLuint nearest_sampler, linear_sampler, mipmap_sampler;
+GLuint nearest_sampler, linear_sampler;
 GLuint vertex_vbo;
 
 string read_file(const string &filename)
@@ -152,10 +153,10 @@ GLuint load_texture(const char *filename, unsigned width, unsigned height)
 
 GLuint link_program(GLuint vs_obj, GLuint fs_obj)
 {
-        GLuint program = glCreateProgram();
-        glAttachShader(program, vs_obj);
-        glAttachShader(program, fs_obj);
-        glLinkProgram(program);
+       GLuint program = glCreateProgram();
+       glAttachShader(program, vs_obj);
+       glAttachShader(program, fs_obj);
+       glLinkProgram(program);
        GLint success;
        glGetProgramiv(program, GL_LINK_STATUS, &success);
        if (success == GL_FALSE) {
@@ -223,7 +224,7 @@ private:
        GLuint sobel_program;
        GLuint sobel_vao;
 
-       GLuint uniform_tex, uniform_image_size, uniform_inv_image_size;
+       GLuint uniform_tex, uniform_image_size;
 };
 
 Sobel::Sobel()
@@ -233,15 +234,14 @@ Sobel::Sobel()
        sobel_program = link_program(sobel_vs_obj, sobel_fs_obj);
 
        // Set up the VAO containing all the required position/texcoord data.
-        glCreateVertexArrays(1, &sobel_vao);
-        glBindVertexArray(sobel_vao);
+       glCreateVertexArrays(1, &sobel_vao);
+       glBindVertexArray(sobel_vao);
 
        GLint position_attrib = glGetAttribLocation(sobel_program, "position");
        glEnableVertexArrayAttrib(sobel_vao, position_attrib);
        glVertexAttribPointer(position_attrib, 2, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(0));
 
        uniform_tex = glGetUniformLocation(sobel_program, "tex");
-       uniform_inv_image_size = glGetUniformLocation(sobel_program, "inv_image_size");
 }
 
 void Sobel::exec(GLint tex0_view, GLint grad0_tex, int level_width, int level_height)
@@ -250,7 +250,6 @@ void Sobel::exec(GLint tex0_view, GLint grad0_tex, int level_width, int level_he
        glBindTextureUnit(0, tex0_view);
        glBindSampler(0, nearest_sampler);
        glProgramUniform1i(sobel_program, uniform_tex, 0);
-       glProgramUniform2f(sobel_program, uniform_inv_image_size, 1.0f / level_width, 1.0f / level_height);
 
        GLuint grad0_fbo;  // TODO: cleanup
        glCreateFramebuffers(1, &grad0_fbo);
@@ -258,7 +257,7 @@ void Sobel::exec(GLint tex0_view, GLint grad0_tex, int level_width, int level_he
 
        glViewport(0, 0, level_width, level_height);
        glBindFramebuffer(GL_FRAMEBUFFER, grad0_fbo);
-        glBindVertexArray(sobel_vao);
+       glBindVertexArray(sobel_vao);
        glUseProgram(sobel_program);
        glDisable(GL_BLEND);
        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -287,8 +286,8 @@ MotionSearch::MotionSearch()
        motion_search_program = link_program(motion_vs_obj, motion_fs_obj);
 
        // Set up the VAO containing all the required position/texcoord data.
-        glCreateVertexArrays(1, &motion_search_vao);
-        glBindVertexArray(motion_search_vao);
+       glCreateVertexArrays(1, &motion_search_vao);
+       glBindVertexArray(motion_search_vao);
        glBindBuffer(GL_ARRAY_BUFFER, vertex_vbo);
 
        GLint position_attrib = glGetAttribLocation(motion_search_program, "position");
@@ -321,7 +320,7 @@ void MotionSearch::exec(GLuint tex0_view, GLuint tex1_view, GLuint grad0_tex, GL
 
        glViewport(0, 0, width_patches, height_patches);
        glBindFramebuffer(GL_FRAMEBUFFER, flow_fbo);
-        glBindVertexArray(motion_search_vao);
+       glBindVertexArray(motion_search_vao);
        glUseProgram(motion_search_program);
        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
@@ -356,8 +355,8 @@ Densify::Densify()
        densify_program = link_program(densify_vs_obj, densify_fs_obj);
 
        // Set up the VAO containing all the required position/texcoord data.
-        glCreateVertexArrays(1, &densify_vao);
-        glBindVertexArray(densify_vao);
+       glCreateVertexArrays(1, &densify_vao);
+       glBindVertexArray(densify_vao);
        glBindBuffer(GL_ARRAY_BUFFER, vertex_vbo);
 
        GLint position_attrib = glGetAttribLocation(densify_program, "position");
@@ -398,11 +397,132 @@ void Densify::exec(GLuint tex0_view, GLuint tex1_view, GLuint flow_tex, GLuint d
        glViewport(0, 0, level_width, level_height);
        glEnable(GL_BLEND);
        glBlendFunc(GL_ONE, GL_ONE);
-        glBindVertexArray(densify_vao);
+       glBindVertexArray(densify_vao);
        glBindFramebuffer(GL_FRAMEBUFFER, dense_flow_fbo);
        glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, width_patches * height_patches);
 }
 
+// Warp I_1 to I_w, and then compute the mean (I) and difference (I_t) of
+// I_0 and I_w. The prewarping is what enables us to solve the variational
+// flow for du,dv instead of u,v.
+//
+// See variational_refinement.txt for more information.
+class Prewarp {
+public:
+       Prewarp();
+       void exec(GLuint tex0_view, GLuint tex1_view, GLuint flow_tex, GLuint I_tex, GLuint I_t_tex, int level_width, int level_height);
+
+private:
+       GLuint prewarp_vs_obj;
+       GLuint prewarp_fs_obj;
+       GLuint prewarp_program;
+       GLuint prewarp_vao;
+
+       GLuint uniform_image0_tex, uniform_image1_tex, uniform_flow_tex;
+};
+
+Prewarp::Prewarp()
+{
+       prewarp_vs_obj = compile_shader(read_file("vs.vert"), GL_VERTEX_SHADER);
+       prewarp_fs_obj = compile_shader(read_file("prewarp.frag"), GL_FRAGMENT_SHADER);
+       prewarp_program = link_program(prewarp_vs_obj, prewarp_fs_obj);
+
+       // Set up the VAO containing all the required position/texcoord data.
+       glCreateVertexArrays(1, &prewarp_vao);
+       glBindVertexArray(prewarp_vao);
+       glBindBuffer(GL_ARRAY_BUFFER, vertex_vbo);
+
+       GLint position_attrib = glGetAttribLocation(prewarp_program, "position");
+       glEnableVertexArrayAttrib(prewarp_vao, position_attrib);
+       glVertexAttribPointer(position_attrib, 2, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(0));
+
+       uniform_image0_tex = glGetUniformLocation(prewarp_program, "image0_tex");
+       uniform_image1_tex = glGetUniformLocation(prewarp_program, "image1_tex");
+       uniform_flow_tex = glGetUniformLocation(prewarp_program, "flow_tex");
+}
+
+void Prewarp::exec(GLuint tex0_view, GLuint tex1_view, GLuint flow_tex, GLuint I_tex, GLuint I_t_tex, int level_width, int level_height)
+{
+       glUseProgram(prewarp_program);
+
+       bind_sampler(prewarp_program, uniform_image0_tex, 0, tex0_view, nearest_sampler);
+       bind_sampler(prewarp_program, uniform_image1_tex, 1, tex1_view, linear_sampler);
+       bind_sampler(prewarp_program, uniform_flow_tex, 2, flow_tex, nearest_sampler);
+
+       GLuint prewarp_fbo;  // TODO: cleanup
+       glCreateFramebuffers(1, &prewarp_fbo);
+       GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
+       glNamedFramebufferDrawBuffers(prewarp_fbo, 2, bufs);
+       glNamedFramebufferTexture(prewarp_fbo, GL_COLOR_ATTACHMENT0, I_tex, 0);
+       glNamedFramebufferTexture(prewarp_fbo, GL_COLOR_ATTACHMENT1, I_t_tex, 0);
+
+       glViewport(0, 0, level_width, level_height);
+       glDisable(GL_BLEND);
+       glBindVertexArray(prewarp_vao);
+       glBindFramebuffer(GL_FRAMEBUFFER, prewarp_fbo);
+       glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+}
+
+// From I, calculate the partial derivatives I_x and I_y. We use a four-tap
+// central difference filter, since apparently, that's tradition (I haven't
+// measured quality versus a more normal 0.5 (I[x+1] - I[x-1]).)
+// The coefficients come from
+//
+//   https://en.wikipedia.org/wiki/Finite_difference_coefficient
+//
+// Also computes β_0, since it depends only on I_x and I_y.
+class Derivatives {
+public:
+       Derivatives();
+       void exec(GLuint input_tex, GLuint I_x_y_tex, GLuint beta_0_tex, int level_width, int level_height);
+
+private:
+       GLuint derivatives_vs_obj;
+       GLuint derivatives_fs_obj;
+       GLuint derivatives_program;
+       GLuint derivatives_vao;
+
+       GLuint uniform_tex;
+};
+
+Derivatives::Derivatives()
+{
+       derivatives_vs_obj = compile_shader(read_file("vs.vert"), GL_VERTEX_SHADER);
+       derivatives_fs_obj = compile_shader(read_file("derivatives.frag"), GL_FRAGMENT_SHADER);
+       derivatives_program = link_program(derivatives_vs_obj, derivatives_fs_obj);
+
+       // Set up the VAO containing all the required position/texcoord data.
+       glCreateVertexArrays(1, &derivatives_vao);
+       glBindVertexArray(derivatives_vao);
+       glBindBuffer(GL_ARRAY_BUFFER, vertex_vbo);
+
+       GLint position_attrib = glGetAttribLocation(derivatives_program, "position");
+       glEnableVertexArrayAttrib(derivatives_vao, position_attrib);
+       glVertexAttribPointer(position_attrib, 2, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(0));
+
+       uniform_tex = glGetUniformLocation(derivatives_program, "tex");
+}
+
+void Derivatives::exec(GLuint input_tex, GLuint I_x_y_tex, GLuint beta_0_tex, int level_width, int level_height)
+{
+       glUseProgram(derivatives_program);
+
+       bind_sampler(derivatives_program, uniform_tex, 0, input_tex, nearest_sampler);
+
+       GLuint derivatives_fbo;  // TODO: cleanup
+       glCreateFramebuffers(1, &derivatives_fbo);
+       GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
+       glNamedFramebufferDrawBuffers(derivatives_fbo, 2, bufs);
+       glNamedFramebufferTexture(derivatives_fbo, GL_COLOR_ATTACHMENT0, I_x_y_tex, 0);
+       glNamedFramebufferTexture(derivatives_fbo, GL_COLOR_ATTACHMENT1, beta_0_tex, 0);
+
+       glViewport(0, 0, level_width, level_height);
+       glDisable(GL_BLEND);
+       glBindVertexArray(derivatives_vao);
+       glBindFramebuffer(GL_FRAMEBUFFER, derivatives_fbo);
+       glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+}
+
 int main(void)
 {
        if (SDL_Init(SDL_INIT_EVERYTHING) == -1) {
@@ -443,12 +563,6 @@ int main(void)
        glSamplerParameteri(linear_sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
        glSamplerParameteri(linear_sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
-       glCreateSamplers(1, &mipmap_sampler);
-       glSamplerParameteri(mipmap_sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
-       glSamplerParameteri(mipmap_sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-       glSamplerParameteri(mipmap_sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-       glSamplerParameteri(mipmap_sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
        float vertices[] = {
                0.0f, 1.0f,
                0.0f, 0.0f,
@@ -469,6 +583,8 @@ int main(void)
        Sobel sobel;
        MotionSearch motion_search;
        Densify densify;
+       Prewarp prewarp;
+       Derivatives derivatives;
 
        GLuint query;
        glGenQueries(1, &query);
@@ -506,7 +622,7 @@ int main(void)
                // Create an output flow texture.
                GLuint flow_out_tex;
                glCreateTextures(GL_TEXTURE_2D, 1, &flow_out_tex);
-               glTextureStorage2D(flow_out_tex, 1, GL_RG16F, width_patches, height_patches);
+               glTextureStorage2D(flow_out_tex, 1, GL_RGB16F, width_patches, height_patches);
 
                // And draw.
                motion_search.exec(tex0_view, tex1_view, grad0_tex, prev_level_flow_tex, flow_out_tex, level_width, level_height, width_patches, height_patches);
@@ -521,7 +637,28 @@ int main(void)
                // And draw.
                densify.exec(tex0_view, tex1_view, flow_out_tex, dense_flow_tex, level_width, level_height, width_patches, height_patches);
 
-               // TODO: Variational refinement.
+               // Everything below here in the loop belongs to variational refinement.
+               // It is not done yet.
+
+               // Prewarping; create I and I_t.
+               GLuint I_tex, I_t_tex;
+               glCreateTextures(GL_TEXTURE_2D, 1, &I_tex);
+               glCreateTextures(GL_TEXTURE_2D, 1, &I_t_tex);
+               glTextureStorage2D(I_tex, 1, GL_R16F, level_width, level_height);
+               glTextureStorage2D(I_t_tex, 1, GL_R16F, level_width, level_height);
+               prewarp.exec(tex0_view, tex1_view, dense_flow_tex, I_tex, I_t_tex, level_width, level_height);
+
+               // Calculate I_x and I_y. We're only calculating first derivatives;
+               // the others will be taken on-the-fly in order to sample from fewer
+               // textures overall, since sampling from the L1 cache is cheap.
+               // (TODO: Verify that this is indeed faster than making separate
+               // double-derivative textures.)
+               GLuint I_x_y_tex, beta_0_tex;
+               glCreateTextures(GL_TEXTURE_2D, 1, &I_x_y_tex);
+               glCreateTextures(GL_TEXTURE_2D, 1, &beta_0_tex);
+               glTextureStorage2D(I_x_y_tex, 1, GL_RG16F, level_width, level_height);
+               glTextureStorage2D(beta_0_tex, 1, GL_R16F, level_width, level_height);
+               derivatives.exec(I_tex, I_x_y_tex, beta_0_tex, level_width, level_height);
 
                prev_level_flow_tex = dense_flow_tex;
        }
@@ -530,6 +667,7 @@ int main(void)
        GLint available;
        do {
                glGetQueryObjectiv(query, GL_QUERY_RESULT_AVAILABLE, &available);
+               usleep(1000);
        } while (!available);
        GLuint64 time_elapsed;
        glGetQueryObjectui64v(query, GL_QUERY_RESULT, &time_elapsed);