X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.cc;h=1073cb944dbae42fa8bf6f200c01527dcd8a39bb;hb=865316f0129c85cdd0248b87502fe97dec94b3f0;hp=640b6a373a6d0fe2b1e4f631d4f985a1d4f093c6;hpb=89aaf8225c9a6ca079317b248039fba103e8d4a3;p=dcpomatic.git diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index 640b6a373..1073cb944 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -194,12 +194,15 @@ static constexpr char fragment_source[] = "in vec2 TexCoord;\n" "\n" "uniform sampler2D texture_sampler;\n" -/* type = 0: draw border - * type = 1: draw XYZ image - * type = 2: draw RGB image +/* type = 0: draw outline content rectangle + * type = 1: draw crop guess rectangle + * type = 2: draw XYZ image + * type = 3: draw RGB image + * See FragmentType enum below. */ "uniform int type = 0;\n" -"uniform vec4 border_colour;\n" +"uniform vec4 outline_content_colour;\n" +"uniform vec4 crop_guess_colour;\n" "uniform mat4 colour_conversion;\n" "\n" "out vec4 FragColor;\n" @@ -258,9 +261,12 @@ static constexpr char fragment_source[] = "{\n" " switch (type) {\n" " case 0:\n" -" FragColor = border_colour;\n" +" FragColor = outline_content_colour;\n" " break;\n" " case 1:\n" +" FragColor = crop_guess_colour;\n" +" break;\n" +" case 2:\n" " FragColor = texture_bicubic(texture_sampler, TexCoord);\n" " FragColor.x = pow(FragColor.x, IN_GAMMA) / DCI_COEFFICIENT;\n" " FragColor.y = pow(FragColor.y, IN_GAMMA) / DCI_COEFFICIENT;\n" @@ -270,13 +276,22 @@ static constexpr char fragment_source[] = " FragColor.y = pow(FragColor.y, OUT_GAMMA);\n" " FragColor.z = pow(FragColor.z, OUT_GAMMA);\n" " break;\n" -" case 2:\n" +" case 3:\n" " FragColor = texture_bicubic(texture_sampler, TexCoord);\n" " break;\n" " }\n" "}\n"; +enum class FragmentType +{ + OUTLINE_CONTENT = 0, + CROP_GUESS = 1, + XYZ_IMAGE = 2, + RGB_IMAGE = 3, +}; + + void GLVideoView::ensure_context () { @@ -291,24 +306,37 @@ GLVideoView::ensure_context () } -/* Offset of video texture triangles in indices */ -static constexpr int indices_video_texture = 0; -/* Offset of subtitle texture triangles in indices */ -static constexpr int indices_subtitle_texture = 6; -/* Offset of border lines in indices */ -static constexpr int indices_border = 12; +/* Offset and number of indices for the things in the indices array below */ +static constexpr int indices_video_texture_offset = 0; +static constexpr int indices_video_texture_number = 6; +static constexpr int indices_subtitle_texture_offset = indices_video_texture_offset + indices_video_texture_number; +static constexpr int indices_subtitle_texture_number = 6; +static constexpr int indices_outline_content_offset = indices_subtitle_texture_offset + indices_subtitle_texture_number; +static constexpr int indices_outline_content_number = 8; +static constexpr int indices_crop_guess_offset = indices_outline_content_offset + indices_outline_content_number; +static constexpr int indices_crop_guess_number = 8; static constexpr unsigned int indices[] = { 0, 1, 3, // video texture triangle #1 1, 2, 3, // video texture triangle #2 4, 5, 7, // subtitle texture triangle #1 5, 6, 7, // subtitle texture triangle #2 - 8, 9, // border line #1 - 9, 10, // border line #2 - 10, 11, // border line #3 - 11, 8, // border line #4 + 8, 9, // outline content line #1 + 9, 10, // outline content line #2 + 10, 11, // outline content line #3 + 11, 8, // outline content line #4 + 12, 13, // crop guess line #1 + 13, 14, // crop guess line #2 + 14, 15, // crop guess line #3 + 15, 12, // crop guess line #4 }; +/* Offsets of things in the GL_ARRAY_BUFFER */ +static constexpr int array_buffer_video_offset = 0; +static constexpr int array_buffer_subtitle_offset = array_buffer_video_offset + 4 * 5 * sizeof(float); +static constexpr int array_buffer_outline_content_offset = array_buffer_subtitle_offset + 4 * 5 * sizeof(float); +static constexpr int array_buffer_crop_guess_offset = array_buffer_outline_content_offset + 4 * 5 * sizeof(float); + void GLVideoView::setup_shaders () @@ -380,10 +408,9 @@ GLVideoView::setup_shaders () glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &log_length); string log; if (log_length > 0) { - char* log_char = new char[log_length]; - glGetShaderInfoLog(shader, log_length, nullptr, log_char); - log = string(log_char); - delete[] log_char; + std::vector log_char(log_length); + glGetShaderInfoLog(shader, log_length, nullptr, log_char.data()); + log = string(log_char.data()); } glDeleteShader(shader); throw GLError(String::compose("Could not compile shader (%1)", log).c_str(), -1); @@ -409,10 +436,9 @@ GLVideoView::setup_shaders () glGetProgramiv(program, GL_INFO_LOG_LENGTH, &log_length); string log; if (log_length > 0) { - char* log_char = new char[log_length]; - glGetProgramInfoLog(program, log_length, nullptr, log_char); - log = string(log_char); - delete[] log_char; + std::vector log_char(log_length); + glGetProgramInfoLog(program, log_length, nullptr, log_char.data()); + log = string(log_char.data()); } glDeleteProgram (program); throw GLError(String::compose("Could not link shader (%1)", log).c_str(), -1); @@ -424,7 +450,8 @@ GLVideoView::setup_shaders () _fragment_type = glGetUniformLocation (program, "type"); check_gl_error ("glGetUniformLocation"); - set_border_colour (program); + set_outline_content_colour (program); + set_crop_guess_colour (program); auto conversion = dcp::ColourConversion::rec709_to_xyz(); boost::numeric::ublas::matrix matrix = conversion.xyz_to_rgb (); @@ -439,7 +466,7 @@ GLVideoView::setup_shaders () check_gl_error ("glGetUniformLocation"); glUniformMatrix4fv (colour_conversion, 1, GL_TRUE, gl_matrix); - glLineWidth (1.0f); + glLineWidth (2.0f); check_gl_error ("glLineWidth"); glEnable (GL_BLEND); check_gl_error ("glEnable"); @@ -447,15 +474,15 @@ GLVideoView::setup_shaders () check_gl_error ("glBlendFunc"); /* Reserve space for the GL_ARRAY_BUFFER */ - glBufferData(GL_ARRAY_BUFFER, 12 * 5 * sizeof(float), nullptr, GL_STATIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, 16 * 5 * sizeof(float), nullptr, GL_STATIC_DRAW); check_gl_error ("glBufferData"); } void -GLVideoView::set_border_colour (GLuint program) +GLVideoView::set_outline_content_colour (GLuint program) { - auto uniform = glGetUniformLocation (program, "border_colour"); + auto uniform = glGetUniformLocation (program, "outline_content_colour"); check_gl_error ("glGetUniformLocation"); auto colour = outline_content_colour (); glUniform4f (uniform, colour.Red() / 255.0f, colour.Green() / 255.0f, colour.Blue() / 255.0f, 1.0f); @@ -463,6 +490,17 @@ GLVideoView::set_border_colour (GLuint program) } +void +GLVideoView::set_crop_guess_colour (GLuint program) +{ + auto uniform = glGetUniformLocation (program, "crop_guess_colour"); + check_gl_error ("glGetUniformLocation"); + auto colour = crop_guess_colour (); + glUniform4f (uniform, colour.Red() / 255.0f, colour.Green() / 255.0f, colour.Blue() / 255.0f, 1.0f); + check_gl_error ("glUniform4f"); +} + + void GLVideoView::draw () { @@ -484,17 +522,22 @@ GLVideoView::draw () glBindVertexArray(_vao); check_gl_error ("glBindVertexArray"); - glUniform1i(_fragment_type, _optimise_for_j2k ? 1 : 2); + glUniform1i(_fragment_type, static_cast(_optimise_for_j2k ? FragmentType::XYZ_IMAGE : FragmentType::RGB_IMAGE)); _video_texture->bind(); - glDrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_INT, reinterpret_cast(indices_video_texture * sizeof(int))); + glDrawElements (GL_TRIANGLES, indices_video_texture_number, GL_UNSIGNED_INT, reinterpret_cast(indices_video_texture_offset * sizeof(int))); if (_have_subtitle_to_render) { - glUniform1i(_fragment_type, 2); + glUniform1i(_fragment_type, static_cast(FragmentType::RGB_IMAGE)); _subtitle_texture->bind(); - glDrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_INT, reinterpret_cast(indices_subtitle_texture * sizeof(int))); + glDrawElements (GL_TRIANGLES, indices_subtitle_texture_number, GL_UNSIGNED_INT, reinterpret_cast(indices_subtitle_texture_offset * sizeof(int))); } if (_viewer->outline_content()) { - glUniform1i(_fragment_type, 0); - glDrawElements (GL_LINES, 8, GL_UNSIGNED_INT, reinterpret_cast(indices_border * sizeof(int))); + glUniform1i(_fragment_type, static_cast(FragmentType::OUTLINE_CONTENT)); + glDrawElements (GL_LINES, indices_outline_content_number, GL_UNSIGNED_INT, reinterpret_cast(indices_outline_content_offset * sizeof(int))); + check_gl_error ("glDrawElements"); + } + if (auto guess = _viewer->crop_guess()) { + glUniform1i(_fragment_type, 1); + glDrawElements (GL_LINES, indices_crop_guess_number, GL_UNSIGNED_INT, reinterpret_cast(indices_crop_guess_offset * sizeof(int))); check_gl_error ("glDrawElements"); } @@ -508,7 +551,7 @@ GLVideoView::draw () void GLVideoView::set_image (shared_ptr pv) { - shared_ptr video = _optimise_for_j2k ? pv->raw_image() : pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true); + shared_ptr video = _optimise_for_j2k ? pv->raw_image() : pv->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true); /* Only the player's black frames should be aligned at this stage, so this should * almost always have no work to do. @@ -517,7 +560,7 @@ GLVideoView::set_image (shared_ptr pv) /** If _optimise_for_j2k is true we render a XYZ image, doing the colourspace * conversion, scaling and video range conversion in the GL shader. - * Othewise we render a RGB image without any shader-side processing. + * Otherwise we render a RGB image without any shader-side processing. */ /* XXX: video range conversion */ @@ -539,6 +582,7 @@ GLVideoView::set_image (shared_ptr pv) auto const inter_position = player_video().first->inter_position(); auto const inter_size = player_video().first->inter_size(); auto const out_size = player_video().first->out_size(); + auto const crop_guess = _viewer->crop_guess(); auto x_offset = std::max(0, (canvas_width - out_size.width) / 2); auto y_offset = std::max(0, (canvas_height - out_size.height) / 2); @@ -548,6 +592,7 @@ GLVideoView::set_image (shared_ptr pv) _last_inter_position.set_next (inter_position); _last_inter_size.set_next (inter_size); _last_out_size.set_next (out_size); + _last_crop_guess.set_next (crop_guess); class Rectangle { @@ -617,23 +662,35 @@ GLVideoView::set_image (shared_ptr pv) float _vertices[20]; }; - if (_last_canvas_size.changed() || _last_inter_position.changed() || _last_inter_size.changed() || _last_out_size.changed()) { + auto const sizing_changed = _last_canvas_size.changed() || _last_inter_position.changed() || _last_inter_size.changed() || _last_out_size.changed(); + if (sizing_changed) { const auto video = _optimise_for_j2k ? Rectangle(canvas_size, inter_position.x + x_offset, inter_position.y + y_offset, inter_size) : Rectangle(canvas_size, x_offset, y_offset, out_size); - glBufferSubData (GL_ARRAY_BUFFER, 0, video.size(), video.vertices()); + glBufferSubData (GL_ARRAY_BUFFER, array_buffer_video_offset, video.size(), video.vertices()); check_gl_error ("glBufferSubData (video)"); - const auto border = Rectangle(canvas_size, inter_position.x + x_offset, inter_position.y + y_offset, inter_size); - glBufferSubData (GL_ARRAY_BUFFER, 8 * 5 * sizeof(float), border.size(), border.vertices()); - check_gl_error ("glBufferSubData (border)"); + const auto outline_content = Rectangle(canvas_size, inter_position.x + x_offset, inter_position.y + y_offset, inter_size); + glBufferSubData (GL_ARRAY_BUFFER, array_buffer_outline_content_offset, outline_content.size(), outline_content.vertices()); + check_gl_error ("glBufferSubData (outline_content)"); + } + + if ((sizing_changed || _last_crop_guess.changed()) && crop_guess) { + auto const crop_guess_rectangle = Rectangle( + canvas_size, + inter_position.x + x_offset + inter_size.width * crop_guess->x, + inter_position.y + y_offset + inter_size.height * crop_guess->y, + dcp::Size(inter_size.width * crop_guess->width, inter_size.height * crop_guess->height) + ); + glBufferSubData (GL_ARRAY_BUFFER, array_buffer_crop_guess_offset, crop_guess_rectangle.size(), crop_guess_rectangle.vertices()); + check_gl_error ("glBufferSubData (crop_guess_rectangle)"); } if (_have_subtitle_to_render) { const auto subtitle = Rectangle(canvas_size, inter_position.x + x_offset + text->position.x, inter_position.y + y_offset + text->position.y, text->image->size()); - glBufferSubData (GL_ARRAY_BUFFER, 4 * 5 * sizeof(float), subtitle.size(), subtitle.vertices()); + glBufferSubData (GL_ARRAY_BUFFER, array_buffer_subtitle_offset, subtitle.size(), subtitle.vertices()); check_gl_error ("glBufferSubData (subtitle)"); }