X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=69cd276e17a9fa6ac64aef63f0bde2b3003ca9d5;hb=45f9912aa850546e319e32a4052517d67f4e3d8f;hp=d27386d3d685ca79fac6bed542b38efd4cf744b4;hpb=1b3e9b80e4940ccf218062fd5dc907c6079ba249;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index d27386d3d..69cd276e1 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -36,10 +36,10 @@ #include "lib/player.h" #include "lib/video_content.h" #include "lib/ffmpeg_content.h" -#include "lib/imagemagick_content.h" +#include "lib/still_image_content.h" +#include "lib/video_decoder.h" #include "film_viewer.h" #include "wx_util.h" -#include "video_decoder.h" using std::string; using std::pair; @@ -47,6 +47,7 @@ using std::min; using std::max; using std::cout; using std::list; +using std::make_pair; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::weak_ptr; @@ -92,15 +93,15 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) _back_button->SetMinSize (wxSize (32, -1)); _forward_button->SetMinSize (wxSize (32, -1)); - _panel->Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (FilmViewer::paint_panel), 0, this); - _panel->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (FilmViewer::panel_sized), 0, this); - _slider->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (FilmViewer::slider_moved), 0, this); - _slider->Connect (wxID_ANY, wxEVT_SCROLL_PAGEUP, wxScrollEventHandler (FilmViewer::slider_moved), 0, this); - _slider->Connect (wxID_ANY, wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler (FilmViewer::slider_moved), 0, this); - _play_button->Connect (wxID_ANY, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler (FilmViewer::play_clicked), 0, this); - _timer.Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (FilmViewer::timer), 0, this); - _back_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmViewer::back_clicked), 0, this); - _forward_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmViewer::forward_clicked), 0, this); + _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this)); + _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1)); + _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)); + _play_button->Bind (wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, boost::bind (&FilmViewer::play_clicked, this)); + _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this)); + _back_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmViewer::back_clicked, this)); + _forward_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmViewer::forward_clicked, this)); set_film (f); @@ -119,15 +120,19 @@ FilmViewer::set_film (shared_ptr f) _film = f; _frame.reset (); + _queue.clear (); + _slider->SetValue (0); + set_position_text (0); + if (!_film) { return; } - _player = f->player (); + _player = f->make_player (); _player->disable_audio (); - _player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _2, _3)); - _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this)); + _player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _2, _5)); + _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1)); calculate_sizes (); fetch_current_frame_again (); @@ -139,13 +144,22 @@ FilmViewer::fetch_current_frame_again () if (!_player) { return; } - - _player->seek (_player->video_position(), true); + + /* Player::video_position is the time after the last frame that we received. + We want to see it again, so seek back one frame. + */ + + Time p = _player->video_position() - _film->video_frames_to_time (1); + if (p < 0) { + p = 0; + } + + _player->seek (p, true); fetch_next_frame (); } void -FilmViewer::timer (wxTimerEvent &) +FilmViewer::timer () { if (!_player) { return; @@ -153,8 +167,10 @@ FilmViewer::timer (wxTimerEvent &) fetch_next_frame (); - if (_film->length()) { - int const new_slider_position = 4096 * _player->video_position() / _film->length(); + Time const len = _film->length (); + + if (len) { + int const new_slider_position = 4096 * _player->video_position() / len; if (new_slider_position != _slider->GetValue()) { _slider->SetValue (new_slider_position); } @@ -163,7 +179,7 @@ FilmViewer::timer (wxTimerEvent &) void -FilmViewer::paint_panel (wxPaintEvent &) +FilmViewer::paint_panel () { wxPaintDC dc (_panel); @@ -197,7 +213,7 @@ FilmViewer::paint_panel (wxPaintEvent &) void -FilmViewer::slider_moved (wxScrollEvent &) +FilmViewer::slider_moved () { if (_film && _player) { _player->seek (_slider->GetValue() * _film->length() / 4096, false); @@ -223,7 +239,7 @@ FilmViewer::calculate_sizes () Ratio const * container = _film->container (); - float const panel_ratio = static_cast (_panel_size.width) / _panel_size.height; + float const panel_ratio = _panel_size.ratio (); float const film_ratio = container ? container->ratio () : 1.78; if (panel_ratio < film_ratio) { @@ -244,7 +260,7 @@ FilmViewer::calculate_sizes () } void -FilmViewer::play_clicked (wxCommandEvent &) +FilmViewer::play_clicked () { check_play_state (); } @@ -252,25 +268,46 @@ FilmViewer::play_clicked (wxCommandEvent &) void FilmViewer::check_play_state () { - if (!_film || _film->dcp_video_frame_rate() == 0) { + if (!_film || _film->video_frame_rate() == 0) { return; } if (_play_button->GetValue()) { - _timer.Start (1000 / _film->dcp_video_frame_rate()); + _timer.Start (1000 / _film->video_frame_rate()); } else { _timer.Stop (); } } void -FilmViewer::process_video (shared_ptr image, bool, Time t) +FilmViewer::process_video (shared_ptr image, Eyes eyes, Time t) { + if (eyes == EYES_RIGHT) { + return; + } + + if (_got_frame) { + /* This is an additional frame emitted by a single pass. Store it. */ + _queue.push_front (make_pair (image, t)); + return; + } + _frame = image; - _got_frame = true; - double const fps = _film->dcp_video_frame_rate (); + set_position_text (t); +} + +void +FilmViewer::set_position_text (Time t) +{ + if (!_film) { + _frame_number->SetLabel ("0"); + _timecode->SetLabel ("0:0:0.0"); + return; + } + + double const fps = _film->video_frame_rate (); /* Count frame number from 1 ... not sure if this is the best idea */ _frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps / TIME_HZ)) + 1)); @@ -282,7 +319,7 @@ FilmViewer::process_video (shared_ptr image, bool, Time t) int const s = floor (w); w -= s; int const f = rint (w * fps); - _timecode->SetLabel (wxString::Format (wxT("%02d:%02d:%02d:%02d"), h, m, s, f)); + _timecode->SetLabel (wxString::Format (wxT("%02d:%02d:%02d.%02d"), h, m, s, f)); } /** Ask the player to emit its next frame, then update our display */ @@ -296,13 +333,19 @@ FilmViewer::fetch_next_frame () return; } - try { - _got_frame = false; - while (!_got_frame && !_player->pass ()) {} - } catch (DecodeError& e) { - _play_button->SetValue (false); - check_play_state (); - error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data())); + _got_frame = false; + + if (!_queue.empty ()) { + process_video (_queue.back().first, EYES_BOTH, _queue.back().second); + _queue.pop_back (); + } else { + try { + while (!_got_frame && !_player->pass ()) {} + } catch (DecodeError& e) { + _play_button->SetValue (false); + check_play_state (); + error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data())); + } } _panel->Refresh (); @@ -330,18 +373,27 @@ FilmViewer::active_jobs_changed (bool a) } void -FilmViewer::back_clicked (wxCommandEvent &) +FilmViewer::back_clicked () { if (!_player) { return; } - _player->seek (_player->video_position() - _film->video_frames_to_time(1), true); + /* Player::video_position is the time after the last frame that we received. + We want to see the one before it, so we need to go back 2. + */ + + Time p = _player->video_position() - _film->video_frames_to_time (2); + if (p < 0) { + p = 0; + } + + _player->seek (p, true); fetch_next_frame (); } void -FilmViewer::forward_clicked (wxCommandEvent &) +FilmViewer::forward_clicked () { if (!_player) { return; @@ -351,8 +403,12 @@ FilmViewer::forward_clicked (wxCommandEvent &) } void -FilmViewer::player_changed () +FilmViewer::player_changed (bool frequent) { + if (frequent) { + return; + } + calculate_sizes (); fetch_current_frame_again (); }