X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=9dbb0091a348270bed8a211d92818f7d11cdf71d;hp=18d16a461789c9bd93b6e1784d0718eefcb5d184;hb=c76b1fd7fe41a7e371ae1fe1dad21c87a19839f1;hpb=5274b881cc5569188eb5c80dc3151f5a8aaa1d23 diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 18d16a461..9dbb0091a 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -26,6 +26,9 @@ #include "playhead_to_timecode_dialog.h" #include "playhead_to_frame_dialog.h" #include "wx_util.h" +#include "closed_captions_dialog.h" +#include "gl_video_view.h" +#include "simple_video_view.h" #include "lib/film.h" #include "lib/ratio.h" #include "lib/util.h" @@ -42,6 +45,8 @@ #include "lib/butler.h" #include "lib/log.h" #include "lib/config.h" +#include "lib/compose.hpp" +#include "lib/dcpomatic_log.h" extern "C" { #include } @@ -64,6 +69,7 @@ using boost::dynamic_pointer_cast; using boost::weak_ptr; using boost::optional; using dcp::Size; +using namespace dcpomatic; static int @@ -72,109 +78,39 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS return reinterpret_cast(data)->audio_callback (out, frames); } -FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected) - : wxPanel (p) - , _panel (new wxPanel (this)) - , _outline_content (0) - , _eye (0) - , _jump_to_selected (0) - , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096)) - , _rewind_button (new wxButton (this, wxID_ANY, wxT("|<"))) - , _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"))) - , _coalesce_player_changes (false) - , _slider_being_moved (false) - , _was_running_before_slider (false) +FilmViewer::FilmViewer (wxWindow* p) + : _coalesce_player_changes (false) , _audio (DCPOMATIC_RTAUDIO_API) , _audio_channels (0) , _audio_block_size (1024) , _playing (false) + , _suspended (0) , _latency_history_count (0) , _dropped (0) -{ -#ifndef __WXOSX__ - _panel->SetDoubleBuffered (true); + , _closed_captions_dialog (new ClosedCaptionsDialog(p, this)) + , _outline_content (false) + , _eyes (EYES_LEFT) + , _pad_black (false) +#ifdef DCPOMATIC_VARIANT_SWAROOP + , _background_image (false) #endif - - _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); - - _v_sizer = new wxBoxSizer (wxVERTICAL); - SetSizer (_v_sizer); - - _v_sizer->Add (_panel, 1, wxEXPAND); - - wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL); - if (outline_content) { - _outline_content = new wxCheckBox (this, wxID_ANY, _("Outline content")); - view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); - } - - _eye = new wxChoice (this, wxID_ANY); - _eye->Append (_("Left")); - _eye->Append (_("Right")); - _eye->SetSelection (0); - view_options->Add (_eye, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); - - if (jump_to_selected) { - _jump_to_selected = new wxCheckBox (this, wxID_ANY, _("Jump to selected content")); - view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); + , _state_timer ("viewer") + , _gets (0) + , _idle_get (false) +{ + switch (Config::instance()->video_view_type()) { + case Config::VIDEO_VIEW_OPENGL: + _video_view = new GLVideoView (this, p); + break; + case Config::VIDEO_VIEW_SIMPLE: + _video_view = new SimpleVideoView (this, p); + break; } - _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP); - - wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); - - wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL); - time_sizer->Add (_frame_number, 0, wxEXPAND); - time_sizer->Add (_timecode, 0, wxEXPAND); - - h_sizer->Add (_rewind_button, 0, wxALL, 2); - h_sizer->Add (_back_button, 0, wxALL, 2); - h_sizer->Add (time_sizer, 0, wxEXPAND); - h_sizer->Add (_forward_button, 0, wxALL, 2); - h_sizer->Add (_play_button, 0, wxEXPAND); - h_sizer->Add (_slider, 1, wxEXPAND); - - _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6); - - _frame_number->SetMinSize (wxSize (84, -1)); - _rewind_button->SetMinSize (wxSize (32, -1)); - _back_button->SetMinSize (wxSize (32, -1)); - _forward_button->SetMinSize (wxSize (32, -1)); - - _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this)); - _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1)); - if (_outline_content) { - _outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::refresh_panel, this)); - } - _eye->Bind (wxEVT_CHOICE, boost::bind (&FilmViewer::slow_refresh, this)); - _slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&FilmViewer::slider_moved, this, false)); - _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind (&FilmViewer::slider_moved, this, true)); - _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind (&FilmViewer::slider_moved, this, true)); - _slider->Bind (wxEVT_SCROLL_THUMBRELEASE, boost::bind (&FilmViewer::slider_released, this)); - _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind (&FilmViewer::play_clicked, this)); - _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this)); - _rewind_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::rewind_clicked, this, _1)); - _back_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::back_clicked, this, _1)); - _forward_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::forward_clicked, this, _1)); - _frame_number->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::frame_number_clicked, this)); - _timecode->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::timecode_clicked, this)); - if (_jump_to_selected) { - _jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::jump_to_selected_clicked, this)); - _jump_to_selected->SetValue (Config::instance()->jump_to_selected ()); - } + _video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this)); set_film (shared_ptr ()); - JobManager::instance()->ActiveJobsChanged.connect ( - bind (&FilmViewer::active_jobs_changed, this, _2) - ); - - setup_sensitivity (); - _config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1)); config_changed (Config::SOUND_OUTPUT); } @@ -184,6 +120,34 @@ FilmViewer::~FilmViewer () stop (); } +/** Ask for ::get() to be called next time we are idle */ +void +FilmViewer::request_idle_get () +{ + if (_idle_get) { + return; + } + + _idle_get = true; + DCPOMATIC_ASSERT (signal_manager); + signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this)); +} + +void +FilmViewer::idle_handler () +{ + if (!_idle_get) { + return; + } + + if (get(true)) { + _idle_get = false; + } else { + /* get() could not complete quickly so we'll try again later */ + signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this)); + } +} + void FilmViewer::set_film (shared_ptr film) { @@ -192,17 +156,17 @@ FilmViewer::set_film (shared_ptr film) } _film = film; + _video_position = DCPTime (); + _player_video.first.reset (); + _player_video.second = DCPTime (); - _frame.reset (); - - update_position_slider (); - update_position_label (); + _video_view->set_image (shared_ptr()); + _closed_captions_dialog->clear (); if (!_film) { _player.reset (); recreate_butler (); - _frame.reset (); - refresh_panel (); + refresh_view (); return; } @@ -212,17 +176,17 @@ FilmViewer::set_film (shared_ptr film) if (_dcp_decode_reduction) { _player->set_dcp_decode_reduction (_dcp_decode_reduction); } - } catch (bad_alloc) { - error_dialog (this, _("There is not enough free memory to do that.")); + } catch (bad_alloc &) { + error_dialog (_video_view->get(), _("There is not enough free memory to do that.")); _film.reset (); return; } - _player->set_always_burn_open_captions (); + _player->set_always_burn_open_subtitles (); _player->set_play_referenced (); - _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1)); - _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1, _2)); + _film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2)); + _player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3)); /* Keep about 1 second's worth of history samples */ _latency_history_count = _film->audio_frame_rate() / _audio_block_size; @@ -231,85 +195,100 @@ FilmViewer::set_film (shared_ptr film) calculate_sizes (); slow_refresh (); - - setup_sensitivity (); } void FilmViewer::recreate_butler () { - bool const was_running = stop (); + suspend (); _butler.reset (); if (!_film) { + resume (); return; } - AudioMapping map = AudioMapping (_film->audio_channels(), _audio_channels); - - if (_audio_channels != 2 || _film->audio_channels() < 3) { - for (int i = 0; i < min (_film->audio_channels(), _audio_channels); ++i) { - map.set (i, i, 1); - } - } else { - /* Special case: stereo output, at least 3 channel input. - Map so that Lt = L(-3dB) + Ls(-3dB) + C(-6dB) + Lfe(-10dB) - Rt = R(-3dB) + Rs(-3dB) + C(-6dB) + Lfe(-10dB) - */ - map.set (dcp::LEFT, 0, 1 / sqrt(2)); // L -> Lt - map.set (dcp::RIGHT, 1, 1 / sqrt(2)); // R -> Rt - map.set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt - map.set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt - map.set (dcp::LFE, 0, 1 / sqrt(10)); // Lfe -> Lt - map.set (dcp::LFE, 1, 1 / sqrt(10)); // Lfe -> Rt - map.set (dcp::LS, 0, 1 / sqrt(2)); // Ls -> Lt - map.set (dcp::RS, 1, 1 / sqrt(2)); // Rs -> Rt - } + _butler.reset( + new Butler( + _player, + Config::instance()->audio_mapping(_audio_channels), + _audio_channels, + bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), + false, + true + ) + ); - _butler.reset (new Butler (_player, _film->log(), map, _audio_channels)); if (!Config::instance()->sound() && !_audio.isStreamOpen()) { _butler->disable_audio (); } - if (was_running) { - start (); - } + _closed_captions_dialog->set_film_and_butler (_film, _butler); + + resume (); } void -FilmViewer::refresh_panel () +FilmViewer::refresh_view () { - _panel->Refresh (); - _panel->Update (); + _state_timer.set ("update-view"); + _video_view->update (); + _state_timer.unset (); } -void -FilmViewer::get () +/** Try to get a frame from the butler and display it. + * @param lazy true to return false quickly if no video is available quickly (i.e. we are waiting for the butler). + * false to ask the butler to block until it has video (unless it is suspended). + * @return true on success, false if we did nothing because it would have taken too long. + */ +bool +FilmViewer::get (bool lazy) { DCPOMATIC_ASSERT (_butler); + ++_gets; do { - _player_video = _butler->get_video (); + Butler::Error e; + _player_video = _butler->get_video (!lazy, &e); + if (!_player_video.first && e == Butler::AGAIN) { + if (lazy) { + /* No video available; return saying we failed */ + return false; + } else { + /* Player was suspended; come back later */ + signal_manager->when_idle (boost::bind(&FilmViewer::get, this, false)); + return false; + } + } } while ( + _player_video.first && _film->three_d() && - ((_eye->GetSelection() == 0 && _player_video.first->eyes() == EYES_RIGHT) || (_eye->GetSelection() == 1 && _player_video.first->eyes() == EYES_LEFT)) + _eyes != _player_video.first->eyes() && + _player_video.first->eyes() != EYES_BOTH ); - _butler->rethrow (); + try { + _butler->rethrow (); + } catch (DecodeError& e) { + error_dialog (_video_view->get(), e.what()); + } display_player_video (); + PositionChanged (); + + return true; } void FilmViewer::display_player_video () { if (!_player_video.first) { - _frame.reset (); - refresh_panel (); + _video_view->set_image (shared_ptr()); + refresh_view (); return; } - if (_playing && (time() - _player_video.second) > one_video_frame()) { + if (_playing && !_suspended && (time() - _player_video.second) > one_video_frame()) { /* Too late; just drop this frame before we try to get its image (which will be the time-consuming part if this frame is J2K). */ @@ -332,132 +311,51 @@ FilmViewer::display_player_video () * The content's specified colour conversion indicates the colourspace * which the content is in (according to the user). * - * PlayerVideo::image (bound to PlayerVideo::always_rgb) will take the source + * PlayerVideo::image (bound to PlayerVideo::force) will take the source * image and convert it (from whatever the user has said it is) to RGB. */ - _frame = _player_video.first->image ( - bind (&Log::dcp_log, _film->log().get(), _1, _2), - bind (&PlayerVideo::always_rgb, _1), - false, true + _state_timer.set ("get image"); + + _video_view->set_image ( + _player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true) ); + _state_timer.set ("ImageChanged"); ImageChanged (_player_video.first); + _state_timer.unset (); _video_position = _player_video.second; _inter_position = _player_video.first->inter_position (); _inter_size = _player_video.first->inter_size (); - refresh_panel (); -} - -void -FilmViewer::timer () -{ - if (!_film || !_playing) { - return; - } - - get (); - update_position_label (); - update_position_slider (); - DCPTime const next = _video_position + one_video_frame(); - - if (next >= _film->length()) { - stop (); - } - - _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT); - - if (_butler) { - _butler->rethrow (); - } -} - -void -FilmViewer::paint_panel () -{ - wxPaintDC dc (_panel); - - if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) { - dc.Clear (); - return; - } - - wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); - wxBitmap frame_bitmap (frame); - dc.DrawBitmap (frame_bitmap, 0, 0); - - if (_out_size.width < _panel_size.width) { - wxPen p (GetBackgroundColour ()); - wxBrush b (GetBackgroundColour ()); - dc.SetPen (p); - dc.SetBrush (b); - dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height); - } - - if (_out_size.height < _panel_size.height) { - wxPen p (GetBackgroundColour ()); - wxBrush b (GetBackgroundColour ()); - dc.SetPen (p); - dc.SetBrush (b); - dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height); - } + refresh_view (); - if (_outline_content && _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); - } + _closed_captions_dialog->update (time()); } -/** @param page true if this was a PAGEUP/PAGEDOWN event for which we won't receive a THUMBRELEASE */ void -FilmViewer::slider_moved (bool page) +FilmViewer::set_outline_content (bool o) { - if (!_film) { - return; - } - - if (!page && !_slider_being_moved) { - /* This is the first event of a drag; stop playback for the duration of the drag */ - _was_running_before_slider = stop (); - _slider_being_moved = true; - } - - DCPTime t (_slider->GetValue() * _film->length().get() / 4096); - t = t.round (_film->video_frame_rate()); - /* Ensure that we hit the end of the film at the end of the slider */ - if (t >= _film->length ()) { - t = _film->length() - one_video_frame(); - } - seek (t, false); - update_position_label (); + _outline_content = o; + refresh_view (); } void -FilmViewer::slider_released () +FilmViewer::set_eyes (Eyes e) { - if (_was_running_before_slider) { - /* Restart after a drag */ - start (); - } - _slider_being_moved = false; + _eyes = e; + slow_refresh (); } void -FilmViewer::panel_sized (wxSizeEvent& ev) +FilmViewer::video_view_sized () { - _panel_size.width = ev.GetSize().GetWidth(); - _panel_size.height = ev.GetSize().GetHeight(); - calculate_sizes (); if (!quick_refresh()) { slow_refresh (); } - update_position_label (); - update_position_slider (); + PositionChanged (); } void @@ -469,16 +367,16 @@ FilmViewer::calculate_sizes () Ratio const * container = _film->container (); - float const panel_ratio = _panel_size.ratio (); + float const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y; float const film_ratio = container ? container->ratio () : 1.78; - if (panel_ratio < film_ratio) { + if (view_ratio < film_ratio) { /* panel is less widscreen than the film; clamp width */ - _out_size.width = _panel_size.width; + _out_size.width = _video_view->get()->GetSize().x; _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.height = _video_view->get()->GetSize().y; _out_size.width = lrintf (_out_size.height * film_ratio); } @@ -490,22 +388,24 @@ FilmViewer::calculate_sizes () } void -FilmViewer::play_clicked () +FilmViewer::suspend () { - check_play_state (); + ++_suspended; + if (_audio.isStreamRunning()) { + _audio.abortStream(); + } } void -FilmViewer::check_play_state () +FilmViewer::resume () { - if (!_film || _film->video_frame_rate() == 0) { - return; - } - - if (_play_button->GetValue()) { - start (); - } else { - stop (); + --_suspended; + if (_playing && !_suspended) { + if (_audio.isStreamOpen()) { + _audio.setStreamTime (_video_position.seconds()); + _audio.startStream (); + } + timer (); } } @@ -516,6 +416,12 @@ FilmViewer::start () return; } + optional v = PlaybackPermitted (); + if (v && !*v) { + /* Computer says no */ + return; + } + if (_audio.isStreamOpen()) { _audio.setStreamTime (_video_position.seconds()); _audio.startStream (); @@ -523,8 +429,8 @@ FilmViewer::start () _playing = true; _dropped = 0; - timer (); - _play_button->SetValue (true); + _video_view->timer (); + Started (position()); } bool @@ -540,127 +446,14 @@ FilmViewer::stop () } _playing = false; - _play_button->SetValue (false); + Stopped (position()); return true; } void -FilmViewer::update_position_slider () -{ - if (!_film) { - _slider->SetValue (0); - return; - } - - DCPTime const len = _film->length (); - - if (len.get ()) { - int const new_slider_position = 4096 * _video_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("%ld"), lrint (_video_position.seconds() * fps) + 1)); - _timecode->SetLabel (time_to_timecode (_video_position, fps)); -} - -void -FilmViewer::active_jobs_changed (optional j) -{ - /* 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); -} - -DCPTime -FilmViewer::nudge_amount (wxKeyboardState& ev) -{ - DCPTime amount = one_video_frame (); - - if (ev.ShiftDown() && !ev.ControlDown()) { - amount = DCPTime::from_seconds (1); - } else if (!ev.ShiftDown() && ev.ControlDown()) { - amount = DCPTime::from_seconds (10); - } else if (ev.ShiftDown() && ev.ControlDown()) { - amount = DCPTime::from_seconds (60); - } - - return amount; -} - -void -FilmViewer::go_to (DCPTime t) -{ - if (t < DCPTime ()) { - t = DCPTime (); - } - - if (t >= _film->length ()) { - t = _film->length (); - } - - seek (t, true); - update_position_label (); - update_position_slider (); -} - -void -FilmViewer::rewind_clicked (wxMouseEvent& ev) -{ - go_to(DCPTime()); - ev.Skip(); -} - -void -FilmViewer::back_frame () +FilmViewer::player_change (ChangeType type, int property, bool frequent) { - if (!_film) { - return; - } - - go_to (_video_position - one_video_frame()); -} - -void -FilmViewer::forward_frame () -{ - if (!_film) { - return; - } - - go_to (_video_position + one_video_frame()); -} - -void -FilmViewer::back_clicked (wxKeyboardState& ev) -{ - go_to (_video_position - nudge_amount (ev)); -} - -void -FilmViewer::forward_clicked (wxKeyboardState& ev) -{ - go_to (_video_position + nudge_amount (ev)); -} - -void -FilmViewer::player_changed (int property, bool frequent) -{ - if (frequent) { + if (type != CHANGE_TYPE_DONE || frequent) { return; } @@ -686,38 +479,13 @@ FilmViewer::player_changed (int property, bool frequent) if (!refreshed) { slow_refresh (); } - update_position_label (); - update_position_slider (); -} - -void -FilmViewer::setup_sensitivity () -{ - bool const c = _film && !_film->content().empty (); - - _slider->Enable (c); - _rewind_button->Enable (c); - _back_button->Enable (c); - _forward_button->Enable (c); - _play_button->Enable (c); - if (_outline_content) { - _outline_content->Enable (c); - } - _frame_number->Enable (c); - _timecode->Enable (c); - if (_jump_to_selected) { - _jump_to_selected->Enable (c); - } - - _eye->Enable (c && _film->three_d ()); + PositionChanged (); } void -FilmViewer::film_changed (Film::Property p) +FilmViewer::film_change (ChangeType type, Film::Property p) { - if (p == Film::CONTENT || p == Film::THREE_D) { - setup_sensitivity (); - } else if (p == Film::AUDIO_CHANNELS) { + if (type == CHANGE_TYPE_DONE && p == Film::AUDIO_CHANNELS) { recreate_butler (); } } @@ -740,7 +508,7 @@ FilmViewer::quick_refresh () return false; } - if (!_player_video.first->reset_metadata (_player->video_container_size(), _film->frame_size())) { + if (!_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) { return false; } @@ -749,18 +517,12 @@ FilmViewer::quick_refresh () } void -FilmViewer::set_position (DCPTime p) -{ - _video_position = p; - seek (p, true); - update_position_label (); - update_position_slider (); -} - -void -FilmViewer::set_position (shared_ptr content, ContentTime t) +FilmViewer::seek (shared_ptr content, ContentTime t, bool accurate) { - set_position (_player->content_time_to_dcp (content, t)); + optional dt = _player->content_time_to_dcp (content, t); + if (dt) { + seek (*dt, accurate); + } } void @@ -770,58 +532,57 @@ FilmViewer::set_coalesce_player_changes (bool c) if (!c) { BOOST_FOREACH (int i, _pending_player_changes) { - player_changed (i, false); + player_change (CHANGE_TYPE_DONE, i, false); } _pending_player_changes.clear (); } } void -FilmViewer::timecode_clicked () +FilmViewer::seek (DCPTime t, bool accurate) { - PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ()); - if (dialog->ShowModal() == wxID_OK) { - go_to (dialog->get ()); + if (!_butler) { + return; } - dialog->Destroy (); -} -void -FilmViewer::frame_number_clicked () -{ - PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ()); - if (dialog->ShowModal() == wxID_OK) { - go_to (dialog->get ()); + if (t < DCPTime ()) { + t = DCPTime (); } - dialog->Destroy (); -} - -void -FilmViewer::jump_to_selected_clicked () -{ - Config::instance()->set_jump_to_selected (_jump_to_selected->GetValue ()); -} -void -FilmViewer::seek (DCPTime t, bool accurate) -{ - if (!_butler) { - return; + if (t >= _film->length ()) { + t = _film->length (); } - bool const was_running = stop (); + suspend (); + _closed_captions_dialog->clear (); _butler->seek (t, accurate); - get (); - if (was_running) { - start (); + if (!_playing) { + request_idle_get (); + } else { + /* Make sure we get a frame so that _video_position is set up before we resume */ + while (!get(true)) {} } + + resume (); } void FilmViewer::config_changed (Config::Property p) { +#ifdef DCPOMATIC_VARIANT_SWAROOP + if (p == Config::PLAYER_BACKGROUND_IMAGE) { + refresh_view (); + return; + } +#endif + + if (p == Config::AUDIO_MAPPING) { + recreate_butler (); + return; + } + if (p != Config::SOUND && p != Config::SOUND_OUTPUT) { return; } @@ -860,7 +621,7 @@ FilmViewer::config_changed (Config::Property p) } catch (RtAudioError& e) { #endif error_dialog ( - this, + _video_view->get(), _("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what()) ); } @@ -872,6 +633,16 @@ FilmViewer::config_changed (Config::Property p) } } +DCPTime +FilmViewer::uncorrected_time () const +{ + if (_audio.isStreamRunning ()) { + return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime()); + } + + return _video_position; +} + DCPTime FilmViewer::time () const { @@ -886,7 +657,14 @@ FilmViewer::time () const int FilmViewer::audio_callback (void* out_p, unsigned int frames) { - _butler->get_audio (reinterpret_cast (out_p), frames); + while (true) { + optional t = _butler->get_audio (reinterpret_cast (out_p), frames); + if (!t || DCPTime(uncorrected_time() - *t) < one_video_frame()) { + /* There was an underrun or this audio is on time; carry on */ + break; + } + /* The audio we just got was (very) late; drop it and get some more. */ + } boost::mutex::scoped_lock lm (_latency_history_mutex, boost::try_to_lock); if (lm) { @@ -933,5 +711,24 @@ FilmViewer::dcp_decode_reduction () const DCPTime FilmViewer::one_video_frame () const { - return DCPTime::from_frames (1, _film->video_frame_rate()); + return DCPTime::from_frames (1, _film ? _film->video_frame_rate() : 24); +} + +/** Open a dialog box showing our film's closed captions */ +void +FilmViewer::show_closed_captions () +{ + _closed_captions_dialog->Show(); +} + +void +FilmViewer::seek_by (DCPTime by, bool accurate) +{ + seek (_video_position + by, accurate); +} + +void +FilmViewer::set_pad_black (bool p) +{ + _pad_black = p; }