X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=e33a3c118dc92eedf9f63bb1b79c88c88d1834d8;hb=9facdf75a2776319fc5826cfa3dd85340f3c8879;hp=e517c9ccaf55c2cc79c293b7a8211bbc3453271a;hpb=c98c87afe29d9ef74bdced8a9c96d7752f3fe80f;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index e517c9cca..e33a3c118 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -21,25 +21,26 @@ * @brief A wx widget to view a preview of a Film. */ -#include -#include -#include #include "lib/film.h" #include "lib/ratio.h" #include "lib/util.h" #include "lib/job_manager.h" #include "lib/image.h" -#include "lib/scaler.h" #include "lib/exceptions.h" #include "lib/examine_content_job.h" #include "lib/filter.h" #include "lib/player.h" +#include "lib/player_video.h" #include "lib/video_content.h" #include "lib/video_decoder.h" #include "lib/timer.h" -#include "lib/dcp_video.h" +#include "lib/log.h" #include "film_viewer.h" #include "wx_util.h" +#include +#include +#include +#include using std::string; using std::pair; @@ -49,20 +50,23 @@ using std::cout; using std::list; using std::bad_alloc; using std::make_pair; +using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::weak_ptr; using dcp::Size; -FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) +FilmViewer::FilmViewer (wxWindow* p) : wxPanel (p) , _panel (new wxPanel (this)) + , _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content"))) , _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"))) + , _last_get_accurate (true) { #ifndef __WXOSX__ _panel->SetDoubleBuffered (true); @@ -75,6 +79,8 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) _v_sizer->Add (_panel, 1, wxEXPAND); + _v_sizer->Add (_outline_content, 0, wxALL, DCPOMATIC_SIZER_GAP); + wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL); @@ -95,6 +101,7 @@ FilmViewer::FilmViewer (shared_ptr f, 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)); _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)); @@ -103,11 +110,13 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) _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); - + set_film (shared_ptr ()); + JobManager::instance()->ActiveJobsChanged.connect ( bind (&FilmViewer::active_jobs_changed, this, _1) ); + + setup_sensitivity (); } void @@ -135,12 +144,27 @@ FilmViewer::set_film (shared_ptr f) _film.reset (); return; } + + /* Always burn in subtitles, even if we are set not to, otherwise we won't see them + in the preview. + */ + _player->set_burn_subtitles (true); - _player->set_approximate_size (); - _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1)); + _film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1)); + + _player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1)); calculate_sizes (); - get (_position, true); + get (_position, _last_get_accurate); + + setup_sensitivity (); +} + +void +FilmViewer::refresh_panel () +{ + _panel->Refresh (); + _panel->Update (); } void @@ -150,19 +174,49 @@ FilmViewer::get (DCPTime p, bool accurate) return; } - list > dcp_video = _player->get_video (p, accurate); - if (!dcp_video.empty ()) { - _frame = dcp_video.front()->image (PIX_FMT_BGRA, true); - _frame = _frame->scale (_frame->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false); + list > pvf; + try { + pvf = _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 ()) { + try { + _frame = pvf.front()->image (PIX_FMT_RGB24, true, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); + + 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(); + } + + _frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false); + _position = pvf.front()->time (); + _inter_position = pvf.front()->inter_position (); + _inter_size = pvf.front()->inter_size (); + } catch (dcp::DCPReadError& e) { + /* This can happen on the following sequence of events: + * - load encrypted DCP + * - add KDM + * - DCP is examined again, which sets its "playable" flag to 1 + * - as a side effect of the exam, the viewer is updated using the old pieces + * - the DCPDecoder in the old piece gives us an encrypted frame + * - then, the pieces are re-made (but too late). + * + * I hope there's a better way to handle this ... + */ + _frame.reset (); + _position = p; + } } else { _frame.reset (); + _position = p; } - _position = p; - set_position_text (); - _panel->Refresh (); - _panel->Update (); + refresh_panel (); + + _last_get_accurate = accurate; } void @@ -209,9 +263,15 @@ FilmViewer::paint_panel () dc.SetPen (p); dc.SetBrush (b); dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height); - } -} + } + if (_outline_content->GetValue ()) { + wxPen p (wxColour (255, 0, 0), 2); + dc.SetPen (p); + dc.SetBrush (*wxTRANSPARENT_BRUSH); + dc.DrawRectangle (_inter_position.x, _inter_position.y, _inter_size.width, _inter_size.height); + } +} void FilmViewer::slider_moved () @@ -233,8 +293,9 @@ FilmViewer::panel_sized (wxSizeEvent& ev) { _panel_size.width = ev.GetSize().GetWidth(); _panel_size.height = ev.GetSize().GetHeight(); + calculate_sizes (); - get (_position, true); + get (_position, _last_get_accurate); } void @@ -252,24 +313,17 @@ FilmViewer::calculate_sizes () if (panel_ratio < film_ratio) { /* panel is less widscreen than the film; clamp width */ _out_size.width = _panel_size.width; - _out_size.height = _out_size.width / film_ratio; + _out_size.height = rint (_out_size.width / film_ratio); } else { /* panel is more widescreen than the film; clamp height */ _out_size.height = _panel_size.height; - _out_size.width = _out_size.height * film_ratio; + _out_size.width = rint (_out_size.height * film_ratio); } /* Catch silly values */ _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); } @@ -305,16 +359,7 @@ FilmViewer::set_position_text () 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 (_position.seconds() * fps)) + 1)); - - double w = _position.seconds (); - int const h = (w / 3600); - w -= h * 3600; - int const m = (w / 60); - w -= m * 60; - 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 (time_to_timecode (_position, fps)); } void @@ -362,5 +407,27 @@ FilmViewer::player_changed (bool frequent) } calculate_sizes (); - get (_position, true); + get (_position, _last_get_accurate); +} + +void +FilmViewer::setup_sensitivity () +{ + bool const c = _film && !_film->content().empty (); + + _slider->Enable (c); + _back_button->Enable (c); + _forward_button->Enable (c); + _play_button->Enable (c); + _outline_content->Enable (c); + _frame_number->Enable (c); + _timecode->Enable (c); +} + +void +FilmViewer::film_changed (Film::Property p) +{ + if (p == Film::CONTENT) { + setup_sensitivity (); + } }