X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.cc;h=0b1e7aeab94be33d721e42f6cc4ffae7469fd852;hp=6288a24a3e1e7b350cbd94b593781b5d575ca786;hb=c80f7a440de73dead499764b4073d39d54c68b9f;hpb=9bfa07293928c371d59db2091ba2b7e715ce5994 diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index 6288a24a3..0b1e7aeab 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -24,14 +24,19 @@ #endif #include "gl_video_view.h" + +/* This will only build on an new-enough wxWidgets: see the comment in gl_video_view.h */ +#if wxCHECK_VERSION(3,1,0) + #include "film_viewer.h" #include "wx_util.h" -#include "lib/image.h" +#include "lib/butler.h" +#include "lib/cross.h" #include "lib/dcpomatic_assert.h" +#include "lib/dcpomatic_log.h" #include "lib/exceptions.h" -#include "lib/cross.h" +#include "lib/image.h" #include "lib/player_video.h" -#include "lib/butler.h" #include #include @@ -99,12 +104,15 @@ GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent) void GLVideoView::size_changed (wxSizeEvent const& ev) { - _canvas_size = ev.GetSize (); + auto const scale = _canvas->GetDPIScaleFactor(); + int const width = std::round(ev.GetSize().GetWidth() * scale); + int const height = std::round(ev.GetSize().GetHeight() * scale); + _canvas_size = { width, height }; + LOG_GENERAL("GLVideoView canvas size changed to %1x%2", width, height); Sized (); } - GLVideoView::~GLVideoView () { boost::this_thread::disable_interruption dis; @@ -431,9 +439,12 @@ GLVideoView::setup_shaders () check_gl_error ("glGetUniformLocation"); glUniformMatrix4fv (colour_conversion, 1, GL_TRUE, gl_matrix); - glLineWidth (2.0f); + glLineWidth (1.0f); + check_gl_error ("glLineWidth"); glEnable (GL_BLEND); + check_gl_error ("glEnable"); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + check_gl_error ("glBlendFunc"); /* Reserve space for the GL_ARRAY_BUFFER */ glBufferData(GL_ARRAY_BUFFER, 12 * 5 * sizeof(float), nullptr, GL_STATIC_DRAW); @@ -453,7 +464,7 @@ GLVideoView::set_border_colour (GLuint program) void -GLVideoView::draw (Position, dcp::Size) +GLVideoView::draw () { auto pad = pad_colour(); glClearColor(pad.Red() / 255.0, pad.Green() / 255.0, pad.Blue() / 255.0, 1.0); @@ -497,16 +508,16 @@ GLVideoView::draw (Position, dcp::Size) 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, false, 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. */ - video = Image::ensure_aligned (video, false); + video = Image::ensure_alignment (video, Image::Alignment::COMPACT); /** 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 */ @@ -517,7 +528,7 @@ GLVideoView::set_image (shared_ptr pv) _have_subtitle_to_render = static_cast(text) && _optimise_for_j2k; if (_have_subtitle_to_render) { /* opt: only do this if it's a new subtitle? */ - DCPOMATIC_ASSERT (!text->image->aligned()); + DCPOMATIC_ASSERT (text->image->alignment() == Image::Alignment::COMPACT); _subtitle_texture->set (text->image); } @@ -525,9 +536,12 @@ GLVideoView::set_image (shared_ptr pv) auto const canvas_size = _canvas_size.load(); int const canvas_width = canvas_size.GetWidth(); int const canvas_height = canvas_size.GetHeight(); - auto inter_position = player_video().first->inter_position(); - auto inter_size = player_video().first->inter_size(); - auto out_size = player_video().first->out_size(); + 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 x_offset = std::max(0, (canvas_width - out_size.width) / 2); + auto y_offset = std::max(0, (canvas_height - out_size.height) / 2); _last_canvas_size.set_next (canvas_size); _last_video_size.set_next (video->size()); @@ -535,62 +549,91 @@ GLVideoView::set_image (shared_ptr pv) _last_inter_size.set_next (inter_size); _last_out_size.set_next (out_size); - auto x_pixels_to_gl = [canvas_width](int x) { - return (x * 2.0f / canvas_width) - 1.0f; - }; + class Rectangle + { + public: + Rectangle (wxSize canvas_size, float x, float y, dcp::Size size) + : _canvas_size (canvas_size) + { + auto const x1 = x_pixels_to_gl(x); + auto const y1 = y_pixels_to_gl(y); + auto const x2 = x_pixels_to_gl(x + size.width); + auto const y2 = y_pixels_to_gl(y + size.height); + + /* The texture coordinates here have to account for the fact that when we put images into the texture OpenGL + * expected us to start at the lower left but we actually started at the top left. So although the + * top of the texture is at 1.0 we pretend it's the other way round. + */ + + // bottom right + _vertices[0] = x2; + _vertices[1] = y2; + _vertices[2] = 0.0f; + _vertices[3] = 1.0f; + _vertices[4] = 1.0f; + + // top right + _vertices[5] = x2; + _vertices[6] = y1; + _vertices[7] = 0.0f; + _vertices[8] = 1.0f; + _vertices[9] = 0.0f; + + // top left + _vertices[10] = x1; + _vertices[11] = y1; + _vertices[12] = 0.0f; + _vertices[13] = 0.0f; + _vertices[14] = 0.0f; + + // bottom left + _vertices[15] = x1; + _vertices[16] = y2; + _vertices[17] = 0.0f; + _vertices[18] = 0.0f; + _vertices[19] = 1.0f; + } + + float const * vertices () const { + return _vertices; + } + + int const size () const { + return sizeof(_vertices); + } - auto y_pixels_to_gl = [canvas_height](int y) { - return (y * 2.0f / canvas_height) - 1.0f; + private: + /* @param x x position in pixels where 0 is left and canvas_width is right on screen */ + float x_pixels_to_gl(int x) const { + return (x * 2.0f / _canvas_size.GetWidth()) - 1.0f; + } + + /* @param y y position in pixels where 0 is top and canvas_height is bottom on screen */ + float y_pixels_to_gl(int y) const { + return 1.0f - (y * 2.0f / _canvas_size.GetHeight()); + } + + wxSize _canvas_size; + float _vertices[20]; }; if (_last_canvas_size.changed() || _last_inter_position.changed() || _last_inter_size.changed() || _last_out_size.changed()) { - float const video_x1 = x_pixels_to_gl(_optimise_for_j2k ? inter_position.x : 0); - float const video_x2 = x_pixels_to_gl(_optimise_for_j2k ? (inter_position.x + inter_size.width) : out_size.width); - float const video_y1 = y_pixels_to_gl(_optimise_for_j2k ? inter_position.y : 0); - float const video_y2 = y_pixels_to_gl(_optimise_for_j2k ? (inter_position.y + inter_size.height) : out_size.height); - float video_vertices[] = { - // positions // texture coords - video_x2, video_y2, 0.0f, 1.0f, 0.0f, // video texture top right (index 0) - video_x2, video_y1, 0.0f, 1.0f, 1.0f, // video texture bottom right (index 1) - video_x1, video_y1, 0.0f, 0.0f, 1.0f, // video texture bottom left (index 2) - video_x1, video_y2, 0.0f, 0.0f, 0.0f, // video texture top left (index 3) - }; - glBufferSubData (GL_ARRAY_BUFFER, 0, sizeof(video_vertices), video_vertices); - check_gl_error ("glBufferSubData (video)"); + 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); - float const border_x1 = x_pixels_to_gl(inter_position.x); - float const border_y1 = y_pixels_to_gl(inter_position.y); - float const border_x2 = x_pixels_to_gl(inter_position.x + inter_size.width); - float const border_y2 = y_pixels_to_gl(inter_position.y + inter_size.height); - - float border_vertices[] = { - // positions // texture coords - border_x1, border_y1, 0.0f, 0.0f, 0.0f, // border bottom left (index 4) - border_x1, border_y2, 0.0f, 0.0f, 0.0f, // border top left (index 5) - border_x2, border_y2, 0.0f, 0.0f, 0.0f, // border top right (index 6) - border_x2, border_y1, 0.0f, 0.0f, 0.0f, // border bottom right (index 7) - }; + glBufferSubData (GL_ARRAY_BUFFER, 0, video.size(), video.vertices()); + check_gl_error ("glBufferSubData (video)"); - glBufferSubData (GL_ARRAY_BUFFER, 8 * 5 * sizeof(float), sizeof(border_vertices), border_vertices); + 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)"); } if (_have_subtitle_to_render) { - float const subtitle_x1 = x_pixels_to_gl(inter_position.x + text->position.x); - float const subtitle_x2 = x_pixels_to_gl(inter_position.x + text->position.x + text->image->size().width); - float const subtitle_y1 = y_pixels_to_gl(inter_position.y + text->position.y + text->image->size().height); - float const subtitle_y2 = y_pixels_to_gl(inter_position.y + text->position.y); - - float vertices[] = { - // positions // texture coords - subtitle_x2, subtitle_y1, 0.0f, 1.0f, 0.0f, // subtitle texture top right (index 4) - subtitle_x2, subtitle_y2, 0.0f, 1.0f, 1.0f, // subtitle texture bottom right (index 5) - subtitle_x1, subtitle_y2, 0.0f, 0.0f, 1.0f, // subtitle texture bottom left (index 6) - subtitle_x1, subtitle_y1, 0.0f, 0.0f, 0.0f, // subtitle texture top left (index 7) - }; - - glBufferSubData (GL_ARRAY_BUFFER, 4 * 5 * sizeof(float), sizeof(vertices), vertices); + 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()); check_gl_error ("glBufferSubData (subtitle)"); } @@ -656,7 +699,11 @@ GLVideoView::set_image_and_draw () auto pv = player_video().first; if (pv) { set_image (pv); - draw (pv->inter_position(), pv->inter_size()); + } + + draw (); + + if (pv) { _viewer->image_changed (pv); } } @@ -788,7 +835,7 @@ Texture::set (shared_ptr image) glPixelStorei (GL_UNPACK_ALIGNMENT, _unpack_alignment); check_gl_error ("glPixelStorei"); - DCPOMATIC_ASSERT (!image->aligned()); + DCPOMATIC_ASSERT (image->alignment() == Image::Alignment::COMPACT); GLint internal_format; GLenum format; @@ -830,3 +877,4 @@ Texture::set (shared_ptr image) } } +#endif