In YCbCrInput, fix an issue where offsets would be treated as equal even if their...

[movit] / ycbcr_input.cpp

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index 4a0ec0ea12b904e2a41f73b774a2c8da00fe43e6..925bf2a11b2a89032b0d6f20f56110ceced0aa8f 100644 (file)
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -19,10 +19,13 @@ namespace movit {
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,
                        unsigned width, unsigned height,
-                       YCbCrInputSplitting ycbcr_input_splitting)
+                       YCbCrInputSplitting ycbcr_input_splitting,
+                       GLenum type)
        : image_format(image_format),
          ycbcr_format(ycbcr_format),
          ycbcr_input_splitting(ycbcr_input_splitting),
+         needs_mipmaps(false),
+         type(type),
          width(width),
          height(height),
          resource_pool(NULL)
@@ -51,6 +54,8 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                register_uniform_sampler2d("tex_cb", &uniform_tex_cb);
                register_uniform_sampler2d("tex_cr", &uniform_tex_cr);
        }
+
+       register_int("needs_mipmaps", &needs_mipmaps);
 }
 
 YCbCrInput::~YCbCrInput()
@@ -69,21 +74,40 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
                if (texture_num[channel] == 0 && (pbos[channel] != 0 || pixel_data[channel] != NULL)) {
                        GLenum format, internal_format;
                        if (channel == 0 && ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED) {
-                               format = GL_RGB;
-                               internal_format = GL_RGB8;
+                               if (type == GL_UNSIGNED_INT_2_10_10_10_REV) {
+                                       format = GL_RGBA;
+                                       internal_format = GL_RGB10_A2;
+                               } else if (type == GL_UNSIGNED_SHORT) {
+                                       format = GL_RGB;
+                                       internal_format = GL_RGB16;
+                               } else {
+                                       assert(type == GL_UNSIGNED_BYTE);
+                                       format = GL_RGB;
+                                       internal_format = GL_RGB8;
+                               }
                        } else if (channel == 1 && ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
                                format = GL_RG;
-                               internal_format = GL_RG8;
+                               if (type == GL_UNSIGNED_SHORT) {
+                                       internal_format = GL_RG16;
+                               } else {
+                                       assert(type == GL_UNSIGNED_BYTE);
+                                       internal_format = GL_RG8;
+                               }
                        } else {
                                format = GL_RED;
-                               internal_format = GL_R8;
+                               if (type == GL_UNSIGNED_SHORT) {
+                                       internal_format = GL_R16;
+                               } else {
+                                       assert(type == GL_UNSIGNED_BYTE);
+                                       internal_format = GL_R8;
+                               }
                        }
 
                        // (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);
+                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
                        check_error();
                        glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbos[channel]);
                        check_error();
@@ -91,10 +115,14 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
                        check_error();
                        glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch[channel]);
                        check_error();
-                       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], format, GL_UNSIGNED_BYTE, pixel_data[channel]);
+                       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], format, type, pixel_data[channel]);
                        check_error();
                        glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
                        check_error();
+                       if (needs_mipmaps) {
+                               glGenerateMipmap(GL_TEXTURE_2D);
+                               check_error();
+                       }
                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
                        check_error();
                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
@@ -111,7 +139,9 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
 
        // Bind samplers.
        uniform_tex_y = *sampler_num + 0;
-       uniform_tex_cb = *sampler_num + 1;
+       if (ycbcr_input_splitting != YCBCR_INPUT_INTERLEAVED) {
+               uniform_tex_cb = *sampler_num + 1;
+       }
        if (ycbcr_input_splitting == YCBCR_INPUT_PLANAR) {
                uniform_tex_cr = *sampler_num + 2;
        }
@@ -123,7 +153,7 @@ string YCbCrInput::output_fragment_shader()
 {
        float offset[3];
        Matrix3d ycbcr_to_rgb;
-       compute_ycbcr_matrix(ycbcr_format, offset, &ycbcr_to_rgb);
+       compute_ycbcr_matrix(ycbcr_format, offset, &ycbcr_to_rgb, type);
 
        string frag_shader;
 
@@ -145,9 +175,12 @@ string YCbCrInput::output_fragment_shader()
        if (ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED) {
                frag_shader += "#define Y_CB_CR_SAME_TEXTURE 1\n";
        } else if (ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
+               bool cb_cr_offsets_equal =
+                       (fabs(ycbcr_format.cb_x_position - ycbcr_format.cr_x_position) < 1e-6) &&
+                       (fabs(ycbcr_format.cb_y_position - ycbcr_format.cr_y_position) < 1e-6);
                char buf[256];
                snprintf(buf, sizeof(buf), "#define Y_CB_CR_SAME_TEXTURE 0\n#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));
+                       cb_cr_offsets_equal);
                frag_shader += buf;
        } else {
                frag_shader += "#define Y_CB_CR_SAME_TEXTURE 0\n#define CB_CR_SAME_TEXTURE 0\n";
@@ -167,8 +200,10 @@ void YCbCrInput::invalidate_pixel_data()
 bool YCbCrInput::set_int(const std::string& key, int value)
 {
        if (key == "needs_mipmaps") {
-               // We currently do not support this.
-               return (value == 0);
+               if (ycbcr_input_splitting != YCBCR_INPUT_INTERLEAVED && value != 0) {
+                       // We do not currently support this.
+                       return false;
+               }
        }
        return Effect::set_int(key, value);
 }