X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=7e1b618119eec5367b0374fa09239886a3f12181;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hp=e1471d94eb3805ddb754d77dc8812b9f849ba8fb;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index e1471d94e..7e1b61811 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,21 +35,23 @@ #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" -#include "video_decoder.h" using std::string; using std::pair; +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) @@ -57,19 +59,16 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) , _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 (new wxStaticText (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"))) - , _display_frame_x (0) , _got_frame (false) { #ifndef __WXOSX__ _panel->SetDoubleBuffered (true); #endif -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); -#endif _v_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (_v_sizer); @@ -79,7 +78,7 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL); - time_sizer->Add (_frame, 0, wxEXPAND); + time_sizer->Add (_frame_number, 0, wxEXPAND); time_sizer->Add (_timecode, 0, wxEXPAND); h_sizer->Add (_back_button, 0, wxALL, 2); @@ -90,19 +89,19 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6); - _frame->SetMinSize (wxSize (84, -1)); + _frame_number->SetMinSize (wxSize (84, -1)); _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); @@ -111,36 +110,6 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) ); } -void -FilmViewer::film_changed (Film::Property p) -{ - switch (p) { - case Film::CONTAINER: - calculate_sizes (); - update_from_raw (); - break; - case Film::CONTENT: - { - calculate_sizes (); - wxScrollEvent ev; - slider_moved (ev); - break; - } - case Film::WITH_SUBTITLES: - case Film::SUBTITLE_OFFSET: - case Film::SUBTITLE_SCALE: - raw_to_display (); - _panel->Refresh (); - _panel->Update (); - break; - case Film::SCALER: - update_from_decoder (); - break; - default: - break; - } -} - void FilmViewer::set_film (shared_ptr f) { @@ -150,87 +119,85 @@ FilmViewer::set_film (shared_ptr f) _film = f; - _raw_frame.reset (); - _display_frame.reset (); - _panel->Refresh (); - _panel->Update (); - + _frame.reset (); + + _slider->SetValue (0); + set_position_text (DCPTime ()); + if (!_film) { return; } - _player = f->player (); - _player->disable_audio (); - /* Don't disable subtitles here as we may need them, and it's nice to be able to turn them - on and off without needing obtain a new Player. - */ - - _player->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3)); + try { + _player = f->make_player (); + } catch (bad_alloc) { + error_dialog (this, _("There is not enough free memory to do that.")); + _film.reset (); + return; + } - _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1)); - _film->ContentChanged.connect (boost::bind (&FilmViewer::film_content_changed, this, _1, _2)); - - film_changed (Film::CONTENT); - film_changed (Film::CONTAINER); - film_changed (Film::WITH_SUBTITLES); - film_changed (Film::SUBTITLE_OFFSET); - film_changed (Film::SUBTITLE_SCALE); + _player->disable_audio (); + _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_next_frame (); } void -FilmViewer::update_from_decoder () +FilmViewer::fetch_current_frame_again () { if (!_player) { return; } - _player->seek (_player->position ()); - get_frame (); + /* We could do this with a seek and a fetch_next_frame, but this is + a shortcut to make it quicker. + */ + + _got_frame = false; + if (!_player->repeat_last_video ()) { + fetch_next_frame (); + } + _panel->Refresh (); _panel->Update (); } void -FilmViewer::timer (wxTimerEvent &) +FilmViewer::timer () { if (!_player) { return; } - get_frame (); + fetch_next_frame (); - if (_film->length()) { - int const new_slider_position = 4096 * _player->position() / _film->length(); + DCPTime const len = _film->length (); + + 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); } } - - _panel->Refresh (); - _panel->Update (); } void -FilmViewer::paint_panel (wxPaintEvent &) +FilmViewer::paint_panel () { wxPaintDC dc (_panel); - if (!_display_frame || !_film || !_out_size.width || !_out_size.height) { + if (!_frame || !_film || !_out_size.width || !_out_size.height) { dc.Clear (); return; } - if (_display_frame_x) { - dc.SetPen(*wxBLACK_PEN); - dc.SetBrush(*wxBLACK_BRUSH); - dc.DrawRectangle (0, 0, _display_frame_x, _film_size.height); - dc.DrawRectangle (_display_frame_x + _film_size.width, 0, _display_frame_x, _film_size.height); - } - - wxImage frame (_film_size.width, _film_size.height, _display_frame->data()[0], true); + wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); wxBitmap frame_bitmap (frame); - dc.DrawBitmap (frame_bitmap, _display_frame_x, 0); + dc.DrawBitmap (frame_bitmap, 0, 0); if (_out_size.width < _panel_size.width) { wxPen p (GetBackgroundColour ()); @@ -251,17 +218,18 @@ FilmViewer::paint_panel (wxPaintEvent &) void -FilmViewer::slider_moved (wxScrollEvent &) +FilmViewer::slider_moved () { - cout << "slider " << _slider->GetValue() << " " << _film->length() << "\n"; - if (_film && _player) { - _player->seek (_slider->GetValue() * _film->length() / 4096); + 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. + */ + } } - - get_frame (); - _panel->Refresh (); - _panel->Update (); } void @@ -270,33 +238,9 @@ FilmViewer::panel_sized (wxSizeEvent& ev) _panel_size.width = ev.GetSize().GetWidth(); _panel_size.height = ev.GetSize().GetHeight(); calculate_sizes (); - update_from_raw (); -} - -void -FilmViewer::update_from_raw () -{ - if (!_raw_frame) { - return; - } - - raw_to_display (); - - _panel->Refresh (); - _panel->Update (); + fetch_current_frame_again (); } -void -FilmViewer::raw_to_display () -{ - if (!_raw_frame || _out_size.width < 64 || _out_size.height < 64 || !_film) { - return; - } - - /* Get a compacted image as we have to feed it to wxWidgets */ - _display_frame = _raw_frame->scale_and_convert_to_rgb (_film_size, _film->scaler(), false); -} - void FilmViewer::calculate_sizes () { @@ -306,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) { @@ -319,25 +263,22 @@ FilmViewer::calculate_sizes () _out_size.width = _out_size.height * film_ratio; } - /* Work out how much padding there is in terms of our display; this will be the x position - of our _display_frame. - */ - _display_frame_x = 0; -// if (format) { -// _display_frame_x = static_cast (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width; -// } + /* Catch silly values */ + _out_size.width = max (64, _out_size.width); + _out_size.height = max (64, _out_size.height); - _film_size = _out_size; - _film_size.width -= _display_frame_x * 2; + /* 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; - /* Catch silly values */ - if (_out_size.width < 64) { - _out_size.width = 64; - } + _player->set_video_container_size (_out_size); } void -FilmViewer::play_clicked (wxCommandEvent &) +FilmViewer::play_clicked () { check_play_state (); } @@ -345,31 +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, bool, Time t) +FilmViewer::process_video (shared_ptr image, Eyes eyes, DCPTime t) { - _raw_frame = image; - - raw_to_display (); + if (eyes == EYES_RIGHT) { + return; + } + /* 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 (); - /* Count frame number from 1 ... not sure if this is the best idea */ - _frame->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps / TIME_HZ)) + 1)); + set_position_text (t); +} - double w = static_cast(t) / TIME_HZ; +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.seconds() * fps)) + 1)); + + double w = t.seconds (); int const h = (w / 3600); w -= h * 3600; int const m = (w / 60); @@ -377,39 +335,36 @@ 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)); } -/** Get a new _raw_frame from the decoder and then do - * raw_to_display (). - */ +/** Ask the player to emit its next frame, then update our display */ void -FilmViewer::get_frame () +FilmViewer::fetch_next_frame () { - /* Clear our raw frame in case we don't get a new one */ - _raw_frame.reset (); + /* Clear our frame in case we don't get a new one */ + _frame.reset (); if (!_player) { - _display_frame.reset (); return; } + _got_frame = false; + try { - _got_frame = false; - while (!_got_frame) { - if (_player->pass ()) { - /* We didn't get a frame before the decoder gave up, - so clear our display frame. - */ - _display_frame.reset (); - break; - } - } + 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 (); + _panel->Update (); } void @@ -433,39 +388,48 @@ FilmViewer::active_jobs_changed (bool a) } void -FilmViewer::film_content_changed (weak_ptr, int p) +FilmViewer::back_clicked () { - if (p == ContentProperty::LENGTH) { - /* Force an update to our frame */ - wxScrollEvent ev; - slider_moved (ev); - } else if (p == VideoContentProperty::VIDEO_CROP) { - update_from_decoder (); - } + if (!_player) { + return; + } + + /* 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 (); + } + + 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::back_clicked (wxCommandEvent &) +FilmViewer::forward_clicked () { if (!_player) { return; } - - _player->seek_back (); - get_frame (); - _panel->Refresh (); - _panel->Update (); + + fetch_next_frame (); } void -FilmViewer::forward_clicked (wxCommandEvent &) +FilmViewer::player_changed (bool frequent) { - if (!_player) { + if (frequent) { return; } - _player->seek_forward (); - get_frame (); - _panel->Refresh (); - _panel->Update (); + calculate_sizes (); + fetch_current_frame_again (); }