X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=4e155e05d9e11d221c1f53cba945fdc79e2a880a;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=7ecba1903799d28ae658a7eee917bbce6d624983;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 7ecba1903..4e155e05d 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,16 +21,11 @@ * @brief A wx widget to view a preview of a Film. */ -#include -#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" @@ -39,8 +34,13 @@ #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" +#include +#include +#include +#include using std::string; using std::pair; @@ -50,6 +50,7 @@ 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; @@ -70,9 +71,9 @@ FilmViewer::FilmViewer (wxWindow* p) #ifndef __WXOSX__ _panel->SetDoubleBuffered (true); #endif - + _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); - + _v_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (_v_sizer); @@ -110,7 +111,7 @@ 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) ); @@ -119,34 +120,38 @@ FilmViewer::FilmViewer (wxWindow* p) } 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)); } catch (bad_alloc) { error_dialog (this, _("There is not enough free memory to do that.")); _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); + _film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1)); - _player->set_approximate_size (); _player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1)); calculate_sizes (); @@ -169,11 +174,23 @@ FilmViewer::get (DCPTime p, bool accurate) return; } - list > pvf = _player->get_video (p, accurate); + 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 (true); - _frame = _frame->scale (_frame->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false); + _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 (); @@ -196,7 +213,6 @@ FilmViewer::get (DCPTime p, bool accurate) _position = p; } - set_position_text (); refresh_panel (); _last_get_accurate = accurate; @@ -205,18 +221,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 () @@ -269,6 +285,7 @@ FilmViewer::slider_moved () t = _film->length() - DCPTime::from_frames (1, _film->video_frame_rate ()); } get (t, false); + update_position_label (); } void @@ -279,6 +296,8 @@ FilmViewer::panel_sized (wxSizeEvent& ev) calculate_sizes (); get (_position, _last_get_accurate); + update_position_label (); + update_position_slider (); } void @@ -289,10 +308,10 @@ 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; @@ -307,13 +326,6 @@ 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 size down to the next lowest 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); } @@ -329,7 +341,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 { @@ -338,27 +350,36 @@ 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)); - - 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 @@ -366,17 +387,17 @@ FilmViewer::active_jobs_changed (bool a) { if (a) { list > jobs = JobManager::instance()->get (); - list >::iterator i = jobs.begin (); + 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); } @@ -390,12 +411,16 @@ 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); + update_position_label (); + update_position_slider (); } void @@ -407,13 +432,15 @@ FilmViewer::player_changed (bool frequent) calculate_sizes (); get (_position, _last_get_accurate); + 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);