X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=42ce7cd1841fe27b5440e7324e4936b533c74c61;hb=c1bd561d0380f46fcd1cabe9816916a2742f465d;hp=e3f76cbc75960ea94ca3f1218c09b29c61b329ed;hpb=b6a281b4ba1d5e2b91ae3d54e073ee88308f61b6;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index e3f76cbc7..42ce7cd18 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -64,13 +65,16 @@ FilmViewer::FilmViewer (wxWindow* p) : wxPanel (p) , _panel (new wxPanel (this)) , _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content"))) + , _left_eye (new wxRadioButton (this, wxID_ANY, _("Left eye"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP)) + , _right_eye (new wxRadioButton (this, wxID_ANY, _("Right eye"))) , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096)) , _back_button (new wxButton (this, wxID_ANY, wxT("<"))) , _forward_button (new wxButton (this, wxID_ANY, wxT(">"))) , _frame_number (new wxStaticText (this, wxID_ANY, wxT(""))) , _timecode (new wxStaticText (this, wxID_ANY, wxT(""))) , _play_button (new wxToggleButton (this, wxID_ANY, _("Play"))) - , _ignore_player_changes (false) + , _coalesce_player_changes (false) + , _pending_player_change (false) , _last_get_accurate (true) { #ifndef __WXOSX__ @@ -84,7 +88,11 @@ FilmViewer::FilmViewer (wxWindow* p) _v_sizer->Add (_panel, 1, wxEXPAND); - _v_sizer->Add (_outline_content, 0, wxALL, DCPOMATIC_SIZER_GAP); + wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL); + view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP); + view_options->Add (_left_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); + view_options->Add (_right_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); + _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP); wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); @@ -107,6 +115,8 @@ FilmViewer::FilmViewer (wxWindow* p) _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this)); _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1)); _outline_content->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmViewer::refresh_panel, this)); + _left_eye->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&FilmViewer::refresh, this)); + _right_eye->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&FilmViewer::refresh, this)); _slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&FilmViewer::slider_moved, this)); _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind (&FilmViewer::slider_moved, this)); _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind (&FilmViewer::slider_moved, this)); @@ -144,6 +154,7 @@ FilmViewer::set_film (shared_ptr film) try { _player.reset (new Player (_film, _film->playlist ())); + _player->set_fast (); } catch (bad_alloc) { error_dialog (this, _("There is not enough free memory to do that.")); _film.reset (); @@ -181,31 +192,65 @@ FilmViewer::get (DCPTime p, bool accurate) return; } - list > pvf; + list > all_pv; try { - pvf = _player->get_video (p, accurate); + all_pv = _player->get_video (p, accurate); } catch (exception& e) { error_dialog (this, wxString::Format (_("Could not get video for view (%s)"), std_to_wx(e.what()).data())); } - if (!pvf.empty ()) { + if (!all_pv.empty ()) { try { - /* XXX: this could now give us a 48-bit image, which is a bit wasteful, - or a XYZ image, which the code below will currently rely on FFmpeg - to colourspace-convert. - */ - _frame = pvf.front()->image (boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); - ImageChanged (pvf.front ()); - - dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601; - if (pvf.front()->colour_conversion()) { - yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb(); + shared_ptr pv; + if (all_pv.size() == 2) { + /* We have 3D; choose the correct eye */ + if (_left_eye->GetValue()) { + if (all_pv.front()->eyes() == EYES_LEFT) { + pv = all_pv.front(); + } else { + pv = all_pv.back(); + } + } else { + if (all_pv.front()->eyes() == EYES_RIGHT) { + pv = all_pv.front(); + } else { + pv = all_pv.back(); + } + } + } else { + /* 2D; no choice to make */ + pv = all_pv.front (); } - _frame = _frame->scale (_frame->size(), yuv_to_rgb, AV_PIX_FMT_RGB24, false); - _position = pvf.front()->time (); - _inter_position = pvf.front()->inter_position (); - _inter_size = pvf.front()->inter_size (); + /* In an ideal world, what we would do here is: + * + * 1. convert to XYZ exactly as we do in the DCP creation path. + * 2. convert back to RGB for the preview display, compensating + * for the monitor etc. etc. + * + * but this is inefficient if the source is RGB. Since we don't + * (currently) care too much about the precise accuracy of the preview's + * colour mapping (and we care more about its speed) we try to short- + * circuit this "ideal" situation in some cases. + * + * The content's specified colour conversion indicates the colourspace + * which the content is in (according to the user). + * + * PlayerVideo::image (bound to PlayerVideo::always_rgb) will take the source + * image and convert it (from whatever the user has said it is) to RGB. + */ + + _frame = pv->image ( + bind (&Log::dcp_log, _film->log().get(), _1, _2), + bind (&PlayerVideo::always_rgb, _1), + false, true + ); + + ImageChanged (pv); + + _position = pv->time (); + _inter_position = pv->inter_position (); + _inter_size = pv->inter_size (); } catch (dcp::DCPReadError& e) { /* This can happen on the following sequence of events: * - load encrypted DCP @@ -432,7 +477,12 @@ FilmViewer::forward_clicked () void FilmViewer::player_changed (bool frequent) { - if (frequent || _ignore_player_changes) { + if (frequent) { + return; + } + + if (_coalesce_player_changes) { + _pending_player_change = true; return; } @@ -454,12 +504,15 @@ FilmViewer::setup_sensitivity () _outline_content->Enable (c); _frame_number->Enable (c); _timecode->Enable (c); + + _left_eye->Enable (c && _film->three_d ()); + _right_eye->Enable (c && _film->three_d ()); } void FilmViewer::film_changed (Film::Property p) { - if (p == Film::CONTENT) { + if (p == Film::CONTENT || p == Film::THREE_D) { setup_sensitivity (); } } @@ -481,7 +534,15 @@ FilmViewer::set_position (DCPTime p) } void -FilmViewer::set_ignore_player_changes (bool i) +FilmViewer::set_coalesce_player_changes (bool c) { - _ignore_player_changes = i; + _coalesce_player_changes = c; + + if (c) { + _pending_player_change = false; + } else { + if (_pending_player_change) { + player_changed (false); + } + } }