X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=f426a7c6e9f86c77764b6274586abcb2760655d1;hb=08d62727f7f1c813cbc7041027fe4a52518623da;hp=d00a582e5d0eb52f7ca1cdda2207245bd227a128;hpb=e5da5518951e91f7bfb80718c9cf546e3ece059c;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index d00a582e5..f426a7c6e 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -35,9 +35,8 @@ #include "lib/filter.h" #include "lib/player.h" #include "lib/video_content.h" -#include "lib/ffmpeg_content.h" -#include "lib/imagemagick_content.h" #include "lib/video_decoder.h" +#include "lib/timer.h" #include "film_viewer.h" #include "wx_util.h" @@ -47,11 +46,12 @@ using std::min; using std::max; using std::cout; using std::list; +using std::bad_alloc; using std::make_pair; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::weak_ptr; -using libdcp::Size; +using dcp::Size; FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) : wxPanel (p) @@ -93,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); @@ -120,19 +120,29 @@ FilmViewer::set_film (shared_ptr f) _film = f; _frame.reset (); - _queue.clear (); - + + _slider->SetValue (0); + set_position_text (DCPTime ()); + if (!_film) { return; } - _player = f->make_player (); + try { + _player = f->make_player (); + } catch (bad_alloc) { + error_dialog (this, _("There is not enough free memory to do that.")); + _film.reset (); + return; + } + _player->disable_audio (); - _player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _3)); + _player->set_approximate_size (); + _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 (); + fetch_next_frame (); } void @@ -142,21 +152,21 @@ FilmViewer::fetch_current_frame_again () return; } - /* Player::video_position is the time after the last frame that we received. - We want to see it again, so seek back one frame. + /* We could do this with a seek and a fetch_next_frame, but this is + a shortcut to make it quicker. */ - Time p = _player->video_position() - _film->video_frames_to_time (1); - if (p < 0) { - p = 0; + _got_frame = false; + if (!_player->repeat_last_video ()) { + fetch_next_frame (); } - - _player->seek (p, true); - fetch_next_frame (); + + _panel->Refresh (); + _panel->Update (); } void -FilmViewer::timer (wxTimerEvent &) +FilmViewer::timer () { if (!_player) { return; @@ -164,10 +174,10 @@ FilmViewer::timer (wxTimerEvent &) fetch_next_frame (); - Time const len = _film->length_with_loop (); + DCPTime const len = _film->length (); - if (len) { - int const new_slider_position = 4096 * _player->video_position() / len; + if (len.get ()) { + int const new_slider_position = 4096 * _player->video_position().get() / len.get(); if (new_slider_position != _slider->GetValue()) { _slider->SetValue (new_slider_position); } @@ -176,7 +186,7 @@ FilmViewer::timer (wxTimerEvent &) void -FilmViewer::paint_panel (wxPaintEvent &) +FilmViewer::paint_panel () { wxPaintDC dc (_panel); @@ -185,9 +195,7 @@ FilmViewer::paint_panel (wxPaintEvent &) return; } - shared_ptr packed_frame (new Image (_frame, false)); - - wxImage frame (_out_size.width, _out_size.height, packed_frame->data()[0], true); + wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); wxBitmap frame_bitmap (frame); dc.DrawBitmap (frame_bitmap, 0, 0); @@ -210,11 +218,17 @@ FilmViewer::paint_panel (wxPaintEvent &) void -FilmViewer::slider_moved (wxScrollEvent &) +FilmViewer::slider_moved () { if (_film && _player) { - _player->seek (_slider->GetValue() * _film->length_with_loop() / 4096, false); - fetch_next_frame (); + try { + _player->seek (DCPTime (_film->length().get() * _slider->GetValue() / 4096), false); + fetch_next_frame (); + } catch (OpenFileError& e) { + /* There was a problem opening a content file; we'll let this slide as it + probably means a missing content file, which we're already taking care of. + */ + } } } @@ -236,7 +250,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) { @@ -253,11 +267,18 @@ FilmViewer::calculate_sizes () _out_size.width = max (64, _out_size.width); _out_size.height = max (64, _out_size.height); + /* The player will round its image down to the nearest 4 pixels + to speed up its scale, so do similar here to avoid black borders + around things. This is a bit of a hack. + */ + _out_size.width &= ~3; + _out_size.height &= ~3; + _player->set_video_container_size (_out_size); } void -FilmViewer::play_clicked (wxCommandEvent &) +FilmViewer::play_clicked () { check_play_state (); } @@ -265,34 +286,48 @@ 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, Time t) +FilmViewer::process_video (shared_ptr image, Eyes eyes, DCPTime t) { - if (_got_frame) { - /* This is an additional frame emitted by a single pass. Store it. */ - _queue.push_front (make_pair (image, t)); + if (eyes == EYES_RIGHT) { return; } - - _frame = image; + + /* Going via BGRA here makes the scaler faster then using RGB24 directly (about + twice on x86 Linux). + */ + shared_ptr im = image->image (PIX_FMT_BGRA, true); + _frame = im->scale (im->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false); _got_frame = true; - double const fps = _film->dcp_video_frame_rate (); + set_position_text (t); +} + +void +FilmViewer::set_position_text (DCPTime 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)); + _frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (t.seconds() * fps)) + 1)); - double w = static_cast(t) / TIME_HZ; + double w = t.seconds (); int const h = (w / 3600); w -= h * 3600; int const m = (w / 60); @@ -300,7 +335,7 @@ FilmViewer::process_video (shared_ptr image, 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 */ @@ -316,17 +351,16 @@ FilmViewer::fetch_next_frame () _got_frame = false; - if (!_queue.empty ()) { - process_video (_queue.back().first, _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())); - } + 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())); + } catch (OpenFileError& e) { + /* There was a problem opening a content file; we'll let this slide as it + probably means a missing content file, which we're already taking care of. + */ } _panel->Refresh (); @@ -354,7 +388,7 @@ FilmViewer::active_jobs_changed (bool a) } void -FilmViewer::back_clicked (wxCommandEvent &) +FilmViewer::back_clicked () { if (!_player) { return; @@ -363,13 +397,24 @@ FilmViewer::back_clicked (wxCommandEvent &) /* 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. */ + + DCPTime p = _player->video_position() - DCPTime::from_frames (2, _film->video_frame_rate ()); + if (p < DCPTime ()) { + p = DCPTime (); + } - _player->seek (_player->video_position() - _film->video_frames_to_time(2), true); - fetch_next_frame (); + try { + _player->seek (p, true); + fetch_next_frame (); + } catch (OpenFileError& e) { + /* There was a problem opening a content file; we'll let this slide as it + probably means a missing content file, which we're already taking care of. + */ + } } void -FilmViewer::forward_clicked (wxCommandEvent &) +FilmViewer::forward_clicked () { if (!_player) { return;