X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=5ca147b747b932be49c035c51b6e9477bffac12e;hb=03dd6e03f5ee261b9c1ed9328ad2762ef3b62057;hp=112736b679867252e08b7c1b9db8ccd404b43e67;hpb=42a122334d594b824c666e5263168386a76801cc;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 112736b67..5ca147b74 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 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 @@ -21,24 +21,29 @@ * @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_frame.h" +#include "lib/player_video.h" #include "lib/video_content.h" #include "lib/video_decoder.h" +#include "lib/timer.h" +#include "lib/log.h" #include "film_viewer.h" #include "wx_util.h" +extern "C" { +#include +} +#include +#include +#include +#include using std::string; using std::pair; @@ -48,33 +53,40 @@ 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 libdcp::Size; +using boost::optional; +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"))) - , _got_frame (false) + , _coalesce_player_changes (false) + , _pending_player_change (false) + , _last_get_accurate (true) { #ifndef __WXOSX__ _panel->SetDoubleBuffered (true); #endif - + _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); - + _v_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (_v_sizer); _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 +107,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,86 +116,136 @@ 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) + bind (&FilmViewer::active_jobs_changed, this, _2) ); + + setup_sensitivity (); } void -FilmViewer::set_film (shared_ptr f) +FilmViewer::set_film (shared_ptr film) { - if (_film == f) { + if (_film == film) { return; } - _film = f; + _film = film; _frame.reset (); - - _slider->SetValue (0); - set_position_text (0); - + + update_position_slider (); + update_position_label (); + if (!_film) { return; } try { - _player = f->make_player (); + _player.reset (new Player (_film, _film->playlist ())); } 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->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1)); + + /* Always burn in subtitles, even if content is set not to, otherwise we won't see them + in the preview. + */ + _player->set_always_burn_subtitles (true); + _player->set_ignore_audio (); + _player->set_play_referenced (); + + _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 (); - fetch_next_frame (); + refresh (); + + setup_sensitivity (); } void -FilmViewer::fetch_current_frame_again () +FilmViewer::refresh_panel () { - if (!_player) { - return; - } - - /* 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 () +FilmViewer::get (DCPTime p, bool accurate) { if (!_player) { return; } - - fetch_next_frame (); - Time const len = _film->length (); + 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 (len) { - int const new_slider_position = 4096 * _player->video_position() / len; - if (new_slider_position != _slider->GetValue()) { - _slider->SetValue (new_slider_position); + if (!pvf.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(); + } + + _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 (); + } 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; } + + refresh_panel (); + + _last_get_accurate = accurate; } +void +FilmViewer::timer () +{ + DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ()); + + if ((_position + frame) >= _film->length ()) { + _play_button->SetValue (false); + check_play_state (); + } else { + get (_position + frame, true); + } + + update_position_label (); + update_position_slider (); +} void FilmViewer::paint_panel () @@ -212,22 +275,30 @@ 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 () { - if (_film && _player) { - Time t = _slider->GetValue() * _film->length() / 4096; - /* Ensure that we hit the end of the film at the end of the slider */ - if (t >= _film->length ()) { - t = _film->length() - _film->video_frames_to_time (1); - } - _player->seek (t, false); - fetch_next_frame (); + if (!_film) { + return; + } + + DCPTime t (_slider->GetValue() * _film->length().get() / 4096); + /* Ensure that we hit the end of the film at the end of the slider */ + if (t >= _film->length ()) { + t = _film->length() - DCPTime::from_frames (1, _film->video_frame_rate ()); } + get (t, false); + update_position_label (); } void @@ -235,8 +306,11 @@ FilmViewer::panel_sized (wxSizeEvent& ev) { _panel_size.width = ev.GetSize().GetWidth(); _panel_size.height = ev.GetSize().GetHeight(); + calculate_sizes (); - fetch_current_frame_again (); + refresh (); + update_position_label (); + update_position_slider (); } void @@ -247,18 +321,18 @@ FilmViewer::calculate_sizes () } Ratio const * container = _film->container (); - + float const panel_ratio = _panel_size.ratio (); float const film_ratio = container ? container->ratio () : 1.78; - + 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 = lrintf (_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 = lrintf (_out_size.height * film_ratio); } /* Catch silly values */ @@ -280,7 +354,7 @@ FilmViewer::check_play_state () if (!_film || _film->video_frame_rate() == 0) { return; } - + if (_play_button->GetValue()) { _timer.Start (1000 / _film->video_frame_rate()); } else { @@ -289,128 +363,139 @@ FilmViewer::check_play_state () } void -FilmViewer::process_video (shared_ptr pvf, Time t) +FilmViewer::update_position_slider () { - if (pvf->eyes() == EYES_RIGHT) { + if (!_film) { + _slider->SetValue (0); return; } - - _frame = pvf->image (PIX_FMT_RGB24); - _got_frame = true; - set_position_text (t); + DCPTime const len = _film->length (); + + if (len.get ()) { + int const new_slider_position = 4096 * _position.get() / len.get(); + if (new_slider_position != _slider->GetValue()) { + _slider->SetValue (new_slider_position); + } + } } void -FilmViewer::set_position_text (Time t) +FilmViewer::update_position_label () { 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)); - - double w = static_cast(t) / TIME_HZ; - 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)); + _frame_number->SetLabel (wxString::Format (wxT("%ld"), lrint (_position.seconds() * fps) + 1)); + _timecode->SetLabel (time_to_timecode (_position, fps)); } -/** Ask the player to emit its next frame, then update our display */ void -FilmViewer::fetch_next_frame () +FilmViewer::active_jobs_changed (optional j) { - /* Clear our frame in case we don't get a new one */ - _frame.reset (); - - if (!_player) { - return; - } + /* examine content is the only job which stops the viewer working */ + bool const a = !j || *j != "examine_content"; + _slider->Enable (a); + _play_button->Enable (a); +} - _got_frame = false; - - 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. - */ +void +FilmViewer::back_clicked () +{ + DCPTime p = _position - DCPTime::from_frames (1, _film->video_frame_rate ()); + if (p < DCPTime ()) { + p = DCPTime (); } - _panel->Refresh (); - _panel->Update (); + get (p, true); + update_position_label (); + update_position_slider (); } void -FilmViewer::active_jobs_changed (bool a) +FilmViewer::forward_clicked () { - if (a) { - list > jobs = JobManager::instance()->get (); - list >::iterator i = jobs.begin (); - while (i != jobs.end() && boost::dynamic_pointer_cast (*i) == 0) { - ++i; - } - - if (i == jobs.end() || (*i)->finished()) { - /* no examine content job running, so we're ok to use the viewer */ - a = false; - } + DCPTime p = _position + DCPTime::from_frames (1, _film->video_frame_rate ()); + if (p >= _film->length ()) { + p = _position; } - - _slider->Enable (!a); - _play_button->Enable (!a); + + get (p, true); + update_position_label (); + update_position_slider (); } void -FilmViewer::back_clicked () +FilmViewer::player_changed (bool frequent) { - if (!_player) { + if (frequent) { 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. - */ - - Time p = _player->video_position() - _film->video_frames_to_time (2); - if (p < 0) { - p = 0; + if (_coalesce_player_changes) { + _pending_player_change = true; + return; } - - _player->seek (p, true); - fetch_next_frame (); + + calculate_sizes (); + refresh (); + update_position_label (); + update_position_slider (); } void -FilmViewer::forward_clicked () +FilmViewer::setup_sensitivity () { - if (!_player) { - return; + 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 (); } +} - fetch_next_frame (); +/** Re-get the current frame */ +void +FilmViewer::refresh () +{ + get (_position, _last_get_accurate); } void -FilmViewer::player_changed (bool frequent) +FilmViewer::set_position (DCPTime p) { - if (frequent) { - return; - } + _position = p; + get (_position, true); + update_position_label (); + update_position_slider (); +} - calculate_sizes (); - fetch_current_frame_again (); +void +FilmViewer::set_coalesce_player_changes (bool c) +{ + _coalesce_player_changes = c; + + if (c) { + _pending_player_change = false; + } else { + if (_pending_player_change) { + player_changed (false); + } + } }