In ResampleEffect, precompute the Lanczos function into a table.

[movit] / ycbcr_input.cpp

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index b1ad4ac7ad3249627fc5c7d309c0de8fc6bbe081..7f58f3fa019d66fa6ac95115f0985463786e85d0 100644 (file)
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -1,120 +1,98 @@
-#include <string.h>
-#include <assert.h>
-
+#include <Eigen/Core>

 #include <Eigen/LU>
 #include <Eigen/LU>

+#include <epoxy/gl.h>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>

 
 

-#include "ycbcr_input.h"
+#include "effect_util.h"
+#include "resource_pool.h"

 #include "util.h"
 #include "util.h"

-#include "opengl.h"
+#include "ycbcr.h"
+#include "ycbcr_input.h"

 
 using namespace Eigen;
 
 using namespace Eigen;

+using namespace std;
+
+namespace movit {

 
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,
 
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,

-                       unsigned width, unsigned height)
+                       unsigned width, unsigned height,
+                       YCbCrInputSplitting ycbcr_input_splitting)

        : image_format(image_format),
          ycbcr_format(ycbcr_format),
        : image_format(image_format),
          ycbcr_format(ycbcr_format),

-         needs_update(false),
-         needs_pbo_recreate(false),
-         finalized(false),
-         needs_mipmaps(false),
+         ycbcr_input_splitting(ycbcr_input_splitting),

          width(width),
          width(width),

-         height(height)
+         height(height),
+         resource_pool(NULL)

 {
        pbos[0] = pbos[1] = pbos[2] = 0;
        texture_num[0] = texture_num[1] = texture_num[2] = 0;
 
 {
        pbos[0] = pbos[1] = pbos[2] = 0;
        texture_num[0] = texture_num[1] = texture_num[2] = 0;
 

-       pitch[0] = pitch[1] = pitch[2] = width;
-

        assert(width % ycbcr_format.chroma_subsampling_x == 0);
        assert(width % ycbcr_format.chroma_subsampling_x == 0);

-       widths[0] = width;
-       widths[1] = width / ycbcr_format.chroma_subsampling_x;
-       widths[2] = width / ycbcr_format.chroma_subsampling_x;
+       pitch[0] = widths[0] = width;
+       pitch[1] = widths[1] = width / ycbcr_format.chroma_subsampling_x;
+       pitch[2] = widths[2] = width / ycbcr_format.chroma_subsampling_x;

 
        assert(height % ycbcr_format.chroma_subsampling_y == 0);
        heights[0] = height;
        heights[1] = height / ycbcr_format.chroma_subsampling_y;
        heights[2] = height / ycbcr_format.chroma_subsampling_y;
 
 
        assert(height % ycbcr_format.chroma_subsampling_y == 0);
        heights[0] = height;
        heights[1] = height / ycbcr_format.chroma_subsampling_y;
        heights[2] = height / ycbcr_format.chroma_subsampling_y;
 

-       register_int("needs_mipmaps", &needs_mipmaps);
-}
+       pixel_data[0] = pixel_data[1] = pixel_data[2] = NULL;

 
 

-YCbCrInput::~YCbCrInput()
-{
-       if (pbos[0] != 0) {
-               glDeleteBuffers(3, pbos);
-               check_error();
-       }
-       if (texture_num[0] != 0) {
-               glDeleteTextures(3, texture_num);
-               check_error();
+       register_uniform_sampler2d("tex_y", &uniform_tex_y);
+
+       if (ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
+               num_channels = 2;
+               register_uniform_sampler2d("tex_cbcr", &uniform_tex_cb);
+       } else {
+               assert(ycbcr_input_splitting == YCBCR_INPUT_PLANAR);
+               num_channels = 3;
+               register_uniform_sampler2d("tex_cb", &uniform_tex_cb);
+               register_uniform_sampler2d("tex_cr", &uniform_tex_cr);

        }
 }
 
        }
 }
 

-void YCbCrInput::finalize()
+YCbCrInput::~YCbCrInput()

 {
 {

-       glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-       check_error();
-
-       // Create PBOs to hold the textures holding the input image, and then the texture itself.
-       glGenBuffers(3, pbos);
-       check_error();
-       glGenTextures(3, texture_num);
-       check_error();
-
-       for (unsigned channel = 0; channel < 3; ++channel) {
-               glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbos[channel]);
-               check_error();
-               glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, pitch[channel] * heights[channel], NULL, GL_STREAM_DRAW);
-               check_error();
-               glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-               check_error();
-               
-               glBindTexture(GL_TEXTURE_2D, texture_num[channel]);
-               check_error();
-               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-               check_error();
-               glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch[channel]);
-               check_error();
-               glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE8, widths[channel], heights[channel], 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
-               check_error();
-               glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-               check_error();
+       for (unsigned channel = 0; channel < num_channels; ++channel) {
+               if (texture_num[channel] != 0) {
+                       resource_pool->release_2d_texture(texture_num[channel]);
+               }

        }
        }

-
-       needs_update = false;
-       finalized = true;

 }
 }

-       
-void YCbCrInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
+
+void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num)

 {
 {

-       for (unsigned channel = 0; channel < 3; ++channel) {
+       for (unsigned channel = 0; channel < num_channels; ++channel) {

                glActiveTexture(GL_TEXTURE0 + *sampler_num + channel);
                check_error();
                glActiveTexture(GL_TEXTURE0 + *sampler_num + channel);
                check_error();

-               glBindTexture(GL_TEXTURE_2D, texture_num[channel]);
-               check_error();
-
-               if (needs_update || needs_pbo_recreate) {
-                       // Copy the pixel data into the PBO.
-                       glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbos[channel]);
-                       check_error();

 
 

-                       if (needs_pbo_recreate) {
-                               // The pitch has changed; we need to reallocate this PBO.
-                               glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, pitch[channel] * heights[channel], NULL, GL_STREAM_DRAW);
-                               check_error();
+               if (texture_num[channel] == 0) {
+                       GLenum format, internal_format;
+                       if (channel == 1 && ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
+                               format = GL_RG;
+                               internal_format = GL_RG8;
+                       } else {
+                               format = GL_RED;
+                               internal_format = GL_R8;

                        }
 
                        }
 

-                       void *mapped_pbo = glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY);
-                       memcpy(mapped_pbo, pixel_data[channel], pitch[channel] * heights[channel]);
-
-                       glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB);
+                       // (Re-)upload the texture.
+                       texture_num[channel] = resource_pool->create_2d_texture(internal_format, widths[channel], heights[channel]);
+                       glBindTexture(GL_TEXTURE_2D, texture_num[channel]);
+                       check_error();
+                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+                       check_error();
+                       glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbos[channel]);
+                       check_error();
+                       glPixelStorei(GL_UNPACK_ALIGNMENT, 1);

                        check_error();
                        check_error();

-
-                       // Re-upload the texture from the PBO.

                        glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch[channel]);
                        check_error();
                        glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch[channel]);
                        check_error();

-                       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], GL_LUMINANCE, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0));
+                       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], format, GL_UNSIGNED_BYTE, pixel_data[channel]);

                        check_error();
                        glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
                        check_error();
                        check_error();
                        glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
                        check_error();


@@ -122,119 +100,78 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix
                        check_error();
                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
                        check_error();
                        check_error();
                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
                        check_error();

-                       glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+               } else {
+                       glBindTexture(GL_TEXTURE_2D, texture_num[channel]);

                        check_error();
                }
        }
 
                        check_error();
                }
        }
 

+       glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+       check_error();
+

        // Bind samplers.
        // Bind samplers.

-       set_uniform_int(glsl_program_num, prefix, "tex_y", *sampler_num + 0);
-       set_uniform_int(glsl_program_num, prefix, "tex_cb", *sampler_num + 1);
-       set_uniform_int(glsl_program_num, prefix, "tex_cr", *sampler_num + 2);
+       uniform_tex_y = *sampler_num + 0;
+       uniform_tex_cb = *sampler_num + 1;
+       if (ycbcr_input_splitting == YCBCR_INPUT_PLANAR) {
+               uniform_tex_cr = *sampler_num + 2;
+       }

 
 

-       *sampler_num += 3;
-       needs_update = false;
-       needs_pbo_recreate = false;
+       *sampler_num += num_channels;

 }
 
 }
 

-std::string YCbCrInput::output_fragment_shader()
+string YCbCrInput::output_fragment_shader()

 {
 {

-       float coeff[3], offset[3], scale[3];
-
-       switch (ycbcr_format.luma_coefficients) {
-       case YCBCR_REC_601:
-               // Rec. 601, page 2.
-               coeff[0] = 0.299;
-               coeff[1] = 0.587;
-               coeff[2] = 0.114;
-               break;
-
-       case YCBCR_REC_709:
-               // Rec. 709, page 19.
-               coeff[0] = 0.2126;
-               coeff[1] = 0.7152;
-               coeff[2] = 0.0722;
-               break;
-       default:
-               assert(false);
-       }
+       float offset[3];
+       Matrix3d ycbcr_to_rgb;
+       compute_ycbcr_matrix(ycbcr_format, offset, &ycbcr_to_rgb);

 
 

-       if (ycbcr_format.full_range) {
-               offset[0] = 0.0 / 255.0;
-               offset[1] = 128.0 / 255.0;
-               offset[2] = 128.0 / 255.0;
+       string frag_shader;

 
 

-               scale[0] = 1.0;
-               scale[1] = 1.0;
-               scale[2] = 1.0;
+       frag_shader = output_glsl_mat3("PREFIX(inv_ycbcr_matrix)", ycbcr_to_rgb);
+       frag_shader += output_glsl_vec3("PREFIX(offset)", offset[0], offset[1], offset[2]);
+
+       float cb_offset_x = compute_chroma_offset(
+               ycbcr_format.cb_x_position, ycbcr_format.chroma_subsampling_x, widths[1]);
+       float cb_offset_y = compute_chroma_offset(
+               ycbcr_format.cb_y_position, ycbcr_format.chroma_subsampling_y, heights[1]);
+       frag_shader += output_glsl_vec2("PREFIX(cb_offset)", cb_offset_x, cb_offset_y);
+
+       float cr_offset_x = compute_chroma_offset(
+               ycbcr_format.cr_x_position, ycbcr_format.chroma_subsampling_x, widths[2]);
+       float cr_offset_y = compute_chroma_offset(
+               ycbcr_format.cr_y_position, ycbcr_format.chroma_subsampling_y, heights[2]);
+       frag_shader += output_glsl_vec2("PREFIX(cr_offset)", cr_offset_x, cr_offset_y);
+
+       if (ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
+               char buf[256];
+               snprintf(buf, sizeof(buf), "#define CB_CR_SAME_TEXTURE 1\n#define CB_CR_OFFSETS_EQUAL %d\n",
+                       (fabs(ycbcr_format.cb_x_position - ycbcr_format.cr_x_position) < 1e-6));
+               frag_shader += buf;

        } else {
        } else {

-               // Rec. 601, page 4; Rec. 709, page 19.
-               offset[0] = 16.0 / 255.0;
-               offset[1] = 128.0 / 255.0;
-               offset[2] = 128.0 / 255.0;
-
-               scale[0] = 255.0 / 219.0;
-               scale[1] = 255.0 / 224.0;
-               scale[2] = 255.0 / 224.0;
+               frag_shader += "#define CB_CR_SAME_TEXTURE 0\n";

        }
 
        }
 

-       // Matrix to convert RGB to YCbCr. See e.g. Rec. 601.
-       Matrix3d rgb_to_ycbcr;
-       rgb_to_ycbcr(0,0) = coeff[0];
-       rgb_to_ycbcr(0,1) = coeff[1];
-       rgb_to_ycbcr(0,2) = coeff[2];
-
-       float cb_fac = (224.0 / 219.0) / (coeff[0] + coeff[1] + 1.0f - coeff[2]);
-       rgb_to_ycbcr(1,0) = -coeff[0] * cb_fac;
-       rgb_to_ycbcr(1,1) = -coeff[1] * cb_fac;
-       rgb_to_ycbcr(1,2) = (1.0f - coeff[2]) * cb_fac;
-
-       float cr_fac = (224.0 / 219.0) / (1.0f - coeff[0] + coeff[1] + coeff[2]);
-       rgb_to_ycbcr(2,0) = (1.0f - coeff[0]) * cr_fac;
-       rgb_to_ycbcr(2,1) = -coeff[1] * cr_fac;
-       rgb_to_ycbcr(2,2) = -coeff[2] * cr_fac;
-
-       // Inverting the matrix gives us what we need to go from YCbCr back to RGB.
-       Matrix3d ycbcr_to_rgb = rgb_to_ycbcr.inverse();
-
-       std::string frag_shader;
-
-       frag_shader = output_glsl_mat3("PREFIX(inv_ycbcr_matrix)", ycbcr_to_rgb);
-
-       char buf[256];
-       sprintf(buf, "const vec3 PREFIX(offset) = vec3(%.8f, %.8f, %.8f);\n",
-               offset[0], offset[1], offset[2]);
-       frag_shader += buf;
-
-       sprintf(buf, "const vec3 PREFIX(scale) = vec3(%.8f, %.8f, %.8f);\n",
-               scale[0], scale[1], scale[2]);
-       frag_shader += buf;
-
-       // OpenGL has texel center in (0.5, 0.5), but different formats have
-       // chroma in various other places. If luma samples are X, the chroma
-       // sample is *, and subsampling is 3x3, the situation with chroma
-       // center in (0.5, 0.5) looks approximately like this:
-       //
-       //   X     X
-       //      *   
-       //   X     X
-       //
-       // If, on the other hand, chroma center is in (0.0, 0.5) (common
-       // for e.g. MPEG-4), the figure changes to:
-       //
-       //   X     X
-       //   *      
-       //   X     X
-       //
-       // Obviously, the chroma plane here needs to be moved to the left,
-       // which means _adding_ 0.5 to the texture coordinates when sampling
-       // chroma.
-       float chroma_offset_x = (0.5f - ycbcr_format.chroma_x_position) / widths[1];
-       float chroma_offset_y = (0.5f - ycbcr_format.chroma_y_position) / heights[1];
-       sprintf(buf, "const vec2 PREFIX(chroma_offset) = vec2(%.8f, %.8f);\n",
-               chroma_offset_x, chroma_offset_y);
-       frag_shader += buf;
-

        frag_shader += read_file("ycbcr_input.frag");
        return frag_shader;
 }
        frag_shader += read_file("ycbcr_input.frag");
        return frag_shader;
 }

+
+void YCbCrInput::invalidate_pixel_data()
+{
+       for (unsigned channel = 0; channel < 3; ++channel) {
+               if (texture_num[channel] != 0) {
+                       resource_pool->release_2d_texture(texture_num[channel]);
+                       texture_num[channel] = 0;
+               }
+       }
+}
+
+bool YCbCrInput::set_int(const std::string& key, int value)
+{
+       if (key == "needs_mipmaps") {
+               // We currently do not support this.
+               return (value == 0);
+       }
+       return Effect::set_int(key, value);
+}
+
+}  // namespace movit