From 4a0db319fc69dbada6270866b5ef9c638f3e653d Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 19 Feb 2017 16:34:15 +0100 Subject: [PATCH] Implement mipmap generation in YCbCrInput, now that we advertise single-texture. --- ycbcr_input.cpp | 15 ++++- ycbcr_input.h | 1 + ycbcr_input_test.cpp | 133 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+), 3 deletions(-) diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp index f748f1c..b9cda5b 100644 --- a/ycbcr_input.cpp +++ b/ycbcr_input.cpp @@ -24,6 +24,7 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format, : image_format(image_format), ycbcr_format(ycbcr_format), ycbcr_input_splitting(ycbcr_input_splitting), + needs_mipmaps(false), type(type), width(width), height(height), @@ -53,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() @@ -104,7 +107,7 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns 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(); @@ -116,6 +119,10 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns 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); @@ -201,8 +208,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); } diff --git a/ycbcr_input.h b/ycbcr_input.h index 712035c..566f828 100644 --- a/ycbcr_input.h +++ b/ycbcr_input.h @@ -176,6 +176,7 @@ private: YCbCrFormat ycbcr_format; GLuint num_channels; YCbCrInputSplitting ycbcr_input_splitting; + int needs_mipmaps; // Only allowed if ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED. GLenum type; GLuint pbos[3], texture_num[3]; GLint uniform_tex_y, uniform_tex_cb, uniform_tex_cr; diff --git a/ycbcr_input_test.cpp b/ycbcr_input_test.cpp index 1d1e23e..33ec74c 100644 --- a/ycbcr_input_test.cpp +++ b/ycbcr_input_test.cpp @@ -13,6 +13,8 @@ #include "resource_pool.h" #include "ycbcr_input.h" +using namespace std; + namespace movit { TEST(YCbCrInputTest, Simple444) { @@ -923,4 +925,135 @@ TEST(YCbCrInputTest, TenBitPlanar) { expect_equal(expected_data, out_data, 4 * width, height, 0.002, 0.0003); } +// Effectively scales down its input linearly by 4x (and repeating it), +// which is not attainable without mipmaps. +class MipmapNeedingEffect : public Effect { +public: + MipmapNeedingEffect() {} + virtual bool needs_mipmaps() const { return true; } + + // To be allowed to mess with the sampler state. + virtual bool needs_texture_bounce() const { return true; } + + virtual string effect_type_id() const { return "MipmapNeedingEffect"; } + string output_fragment_shader() { return read_file("mipmap_needing_effect.frag"); } + virtual void inform_added(EffectChain *chain) { this->chain = chain; } + + void set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num) + { + Node *self = chain->find_node_for_effect(this); + glActiveTexture(chain->get_input_sampler(self, 0)); + check_error(); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); + check_error(); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); + check_error(); + } + +private: + EffectChain *chain; +}; + +// Basically the same test as EffectChainTest_MipmapGenerationWorks, +// just with the data converted to Y'CbCr (as red only). +TEST(EffectChainTest, MipmapGenerationWorks) { + unsigned width = 4; + unsigned height = 16; + float red_data[width * height] = { // In 4x4 blocks. + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.5f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + + 1.0f, 1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, 1.0f, + + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 1.0f, 0.0f, + 0.0f, 1.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + }; + float expected_data[width * height] = { // Repeated four times each way. + 0.125f, 0.125f, 0.125f, 0.125f, + 0.09375f, 0.09375f, 0.09375f, 0.09375f, + 1.0f, 1.0f, 1.0f, 1.0f, + 0.25f, 0.25f, 0.25f, 0.25f, + + 0.125f, 0.125f, 0.125f, 0.125f, + 0.09375f, 0.09375f, 0.09375f, 0.09375f, + 1.0f, 1.0f, 1.0f, 1.0f, + 0.25f, 0.25f, 0.25f, 0.25f, + + 0.125f, 0.125f, 0.125f, 0.125f, + 0.09375f, 0.09375f, 0.09375f, 0.09375f, + 1.0f, 1.0f, 1.0f, 1.0f, + 0.25f, 0.25f, 0.25f, 0.25f, + + 0.125f, 0.125f, 0.125f, 0.125f, + 0.09375f, 0.09375f, 0.09375f, 0.09375f, + 1.0f, 1.0f, 1.0f, 1.0f, + 0.25f, 0.25f, 0.25f, 0.25f, + }; + float expected_data_rgba[width * height * 4]; + unsigned char ycbcr_data[width * height * 3]; + + // Convert to Y'CbCr. + YCbCrFormat ycbcr_format; + ycbcr_format.luma_coefficients = YCBCR_REC_709; + ycbcr_format.full_range = false; + ycbcr_format.num_levels = 256; + ycbcr_format.chroma_subsampling_x = 1; + ycbcr_format.chroma_subsampling_y = 1; + ycbcr_format.cb_x_position = 0.5f; + ycbcr_format.cb_y_position = 0.5f; + ycbcr_format.cr_x_position = 0.5f; + ycbcr_format.cr_y_position = 0.5f; + + float offset[3]; + Eigen::Matrix3d ycbcr_to_rgb; + compute_ycbcr_matrix(ycbcr_format, offset, &ycbcr_to_rgb); + + Eigen::Matrix3d rgb_to_ycbcr = ycbcr_to_rgb.inverse(); + for (unsigned i = 0; i < 64; ++i) { + Eigen::Vector3d rgb(red_data[i], 0.0, 0.0); + Eigen::Vector3d ycbcr = rgb_to_ycbcr * rgb; + ycbcr(0) += offset[0]; + ycbcr(1) += offset[1]; + ycbcr(2) += offset[2]; + ycbcr_data[i * 3 + 0] = lrintf(ycbcr(0) * 255.0); + ycbcr_data[i * 3 + 1] = lrintf(ycbcr(1) * 255.0); + ycbcr_data[i * 3 + 2] = lrintf(ycbcr(2) * 255.0); + } + + // Expand expected_data to RGBA. + for (unsigned i = 0; i < 64; ++i) { + expected_data_rgba[i * 4 + 0] = expected_data[i]; + expected_data_rgba[i * 4 + 1] = 0.0f; + expected_data_rgba[i * 4 + 2] = 0.0f; + expected_data_rgba[i * 4 + 3] = 1.0f; + } + + ImageFormat format; + format.color_space = COLORSPACE_sRGB; + format.gamma_curve = GAMMA_sRGB; + + float out_data[width * height]; + EffectChainTester tester(NULL, width, height); + YCbCrInput *input = new YCbCrInput(format, ycbcr_format, width, height, YCBCR_INPUT_INTERLEAVED); + input->set_pixel_data(0, ycbcr_data); + tester.get_chain()->add_input(input); + tester.get_chain()->add_effect(new MipmapNeedingEffect()); + tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR); + + // The usual pretty loose limits. + expect_equal(expected_data_rgba, out_data, width * 4, height, 0.025, 0.002); +} + } // namespace movit -- 2.39.2