X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=5ca147b747b932be49c035c51b6e9477bffac12e;hb=7de09ede7bc6e34bea6ab3e7982efb51ca399b7d;hp=0938d52a4cdd094af5cfe0255addf9376e5b52e1;hpb=fc96a4b3d6985f28db6bc0e9418e98cc5bec87e3;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 0938d52a4..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 @@ -37,6 +37,9 @@ #include "lib/log.h" #include "film_viewer.h" #include "wx_util.h" +extern "C" { +#include +} #include #include #include @@ -54,6 +57,7 @@ using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::weak_ptr; +using boost::optional; using dcp::Size; FilmViewer::FilmViewer (wxWindow* p) @@ -66,14 +70,16 @@ FilmViewer::FilmViewer (wxWindow* p) , _frame_number (new wxStaticText (this, wxID_ANY, wxT(""))) , _timecode (new wxStaticText (this, wxID_ANY, wxT(""))) , _play_button (new wxToggleButton (this, wxID_ANY, _("Play"))) + , _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); @@ -111,46 +117,53 @@ FilmViewer::FilmViewer (wxWindow* p) _forward_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmViewer::forward_clicked, this)); 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 (); - + + 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; } - + + /* 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 (); - get (_position, _last_get_accurate); + refresh (); setup_sensitivity (); } @@ -175,17 +188,22 @@ FilmViewer::get (DCPTime p, bool 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)); + /* 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, PIX_FMT_RGB24, false); + + _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 (); @@ -208,7 +226,6 @@ FilmViewer::get (DCPTime p, bool accurate) _position = p; } - set_position_text (); refresh_panel (); _last_get_accurate = accurate; @@ -217,18 +234,18 @@ FilmViewer::get (DCPTime p, bool accurate) void FilmViewer::timer () { - get (_position + DCPTime::from_frames (1, _film->video_frame_rate ()), true); + DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ()); - 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); - } + 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 () @@ -281,6 +298,7 @@ FilmViewer::slider_moved () t = _film->length() - DCPTime::from_frames (1, _film->video_frame_rate ()); } get (t, false); + update_position_label (); } void @@ -290,7 +308,9 @@ FilmViewer::panel_sized (wxSizeEvent& ev) _panel_size.height = ev.GetSize().GetHeight(); calculate_sizes (); - get (_position, _last_get_accurate); + refresh (); + update_position_label (); + update_position_slider (); } void @@ -301,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 = rint (_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 = rint (_out_size.height * film_ratio); + _out_size.width = lrintf (_out_size.height * film_ratio); } /* Catch silly values */ @@ -334,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 { @@ -343,38 +363,45 @@ FilmViewer::check_play_state () } void -FilmViewer::set_position_text () +FilmViewer::update_position_slider () +{ + if (!_film) { + _slider->SetValue (0); + return; + } + + 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::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 (_position.seconds() * fps)) + 1)); + _frame_number->SetLabel (wxString::Format (wxT("%ld"), lrint (_position.seconds() * fps) + 1)); _timecode->SetLabel (time_to_timecode (_position, fps)); } void -FilmViewer::active_jobs_changed (bool a) +FilmViewer::active_jobs_changed (optional j) { - 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; - } - } - - _slider->Enable (!a); - _play_button->Enable (!a); + /* 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); } void @@ -386,12 +413,21 @@ FilmViewer::back_clicked () } get (p, true); + update_position_label (); + update_position_slider (); } void FilmViewer::forward_clicked () { - get (_position + DCPTime::from_frames (1, _film->video_frame_rate ()), true); + DCPTime p = _position + DCPTime::from_frames (1, _film->video_frame_rate ()); + if (p >= _film->length ()) { + p = _position; + } + + get (p, true); + update_position_label (); + update_position_slider (); } void @@ -401,15 +437,22 @@ FilmViewer::player_changed (bool frequent) return; } + if (_coalesce_player_changes) { + _pending_player_change = true; + return; + } + calculate_sizes (); - get (_position, _last_get_accurate); + refresh (); + update_position_label (); + update_position_slider (); } void FilmViewer::setup_sensitivity () { bool const c = _film && !_film->content().empty (); - + _slider->Enable (c); _back_button->Enable (c); _forward_button->Enable (c); @@ -426,3 +469,33 @@ FilmViewer::film_changed (Film::Property p) setup_sensitivity (); } } + +/** Re-get the current frame */ +void +FilmViewer::refresh () +{ + get (_position, _last_get_accurate); +} + +void +FilmViewer::set_position (DCPTime p) +{ + _position = p; + get (_position, true); + update_position_label (); + update_position_slider (); +} + +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); + } + } +}