X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=0f18f2e722433d382513764362356aa971803c7c;hb=2538ac5a15b56880438018c8ab17d8571fe76812;hp=bddd3abba280316ae58409b1247a1994cd26c501;hpb=b29571d1fbf3bcd9f5cbd9c20f1d5f8211876e94;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index bddd3abba..0f18f2e72 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -26,6 +26,7 @@ #include "playhead_to_timecode_dialog.h" #include "playhead_to_frame_dialog.h" #include "wx_util.h" +#include "closed_captions_dialog.h" #include "lib/film.h" #include "lib/ratio.h" #include "lib/util.h" @@ -39,6 +40,7 @@ #include "lib/video_content.h" #include "lib/video_decoder.h" #include "lib/timer.h" +#include "lib/butler.h" #include "lib/log.h" #include "lib/config.h" extern "C" { @@ -64,84 +66,46 @@ using boost::weak_ptr; using boost::optional; using dcp::Size; +static +int +rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamStatus, void* data) +{ + return reinterpret_cast(data)->audio_callback (out, frames); +} + FilmViewer::FilmViewer (wxWindow* p) - : wxPanel (p) - , _panel (new wxPanel (this)) - , _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content"))) - , _left_eye (new wxRadioButton (this, wxID_ANY, _("Left eye"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP)) - , _right_eye (new wxRadioButton (this, wxID_ANY, _("Right eye"))) - , _jump_to_selected (new wxCheckBox (this, wxID_ANY, _("Jump to selected 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"))) + : _panel (new wxPanel (p)) , _coalesce_player_changes (false) - , _pending_player_change (false) - , _last_seek_accurate (true) + , _audio (DCPOMATIC_RTAUDIO_API) + , _audio_channels (0) + , _audio_block_size (1024) + , _playing (false) + , _latency_history_count (0) + , _dropped (0) + , _closed_captions_dialog (new ClosedCaptionsDialog(p)) + , _outline_content (false) + , _eyes (EYES_LEFT) { #ifndef __WXOSX__ _panel->SetDoubleBuffered (true); #endif _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); + _panel->SetBackgroundColour (*wxBLACK); - _v_sizer = new wxBoxSizer (wxVERTICAL); - SetSizer (_v_sizer); - - _v_sizer->Add (_panel, 1, wxEXPAND); - - wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL); - view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP); - view_options->Add (_left_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); - view_options->Add (_right_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); - view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); - _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 (_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)); - _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)); - _outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::refresh_panel, this)); - _left_eye->Bind (wxEVT_RADIOBUTTON, boost::bind (&FilmViewer::refresh, this)); - _right_eye->Bind (wxEVT_RADIOBUTTON, boost::bind (&FilmViewer::refresh, 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)); - _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind (&FilmViewer::play_clicked, this)); - _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this)); - _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)); - _jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::jump_to_selected_clicked, this)); - - _jump_to_selected->SetValue (Config::instance()->jump_to_selected ()); + _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this)); + _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1)); + _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this)); set_film (shared_ptr ()); - JobManager::instance()->ActiveJobsChanged.connect ( - bind (&FilmViewer::active_jobs_changed, this, _2) - ); + _config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1)); + config_changed (Config::SOUND_OUTPUT); +} - setup_sensitivity (); +FilmViewer::~FilmViewer () +{ + stop (); } void @@ -153,40 +117,87 @@ FilmViewer::set_film (shared_ptr film) _film = film; - _frame.reset (); + FilmChanged (); - update_position_slider (); - update_position_label (); + _frame.reset (); + _closed_captions_dialog->clear (); if (!_film) { + _player.reset (); + recreate_butler (); + _frame.reset (); + refresh_panel (); return; } try { _player.reset (new Player (_film, _film->playlist ())); _player->set_fast (); + 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.")); + error_dialog (_panel, _("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_always_burn_open_subtitles (); _player->set_play_referenced (); - _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1)); + _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; - _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1)); - _player->Video.connect (boost::bind (&FilmViewer::video, this, _1)); + recreate_butler (); calculate_sizes (); - refresh (); + slow_refresh (); +} + +void +FilmViewer::recreate_butler () +{ + bool const was_running = stop (); + _butler.reset (); + + if (!_film) { + 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, _film->log(), map, _audio_channels)); + if (!Config::instance()->sound() && !_audio.isStreamOpen()) { + _butler->disable_audio (); + } - setup_sensitivity (); + _closed_captions_dialog->set_butler (_butler); + + if (was_running) { + start (); + } } void @@ -197,16 +208,44 @@ FilmViewer::refresh_panel () } void -FilmViewer::video (shared_ptr pv) +FilmViewer::get () { - if (!_player) { - return; - } + DCPOMATIC_ASSERT (_butler); - if (_film->three_d ()) { - if ((_left_eye->GetValue() && pv->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && pv->eyes() == EYES_LEFT)) { + do { + Butler::Error e; + _player_video = _butler->get_video (&e); + if (!_player_video.first && e == Butler::AGAIN) { + signal_manager->when_idle (boost::bind(&FilmViewer::get, this)); return; } + } while ( + _player_video.first && + _film->three_d() && + (_eyes != _player_video.first->eyes()) + ); + + _butler->rethrow (); + + display_player_video (); +} + +void +FilmViewer::display_player_video () +{ + if (!_player_video.first) { + _frame.reset (); + refresh_panel (); + return; + } + + if (_playing && (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). + */ + _video_position = _player_video.second; + ++_dropped; + return; } /* In an ideal world, what we would do here is: @@ -227,42 +266,43 @@ FilmViewer::video (shared_ptr pv) * image and convert it (from whatever the user has said it is) to RGB. */ - _frame = pv->image ( + _frame = _player_video.first->image ( bind (&Log::dcp_log, _film->log().get(), _1, _2), bind (&PlayerVideo::always_rgb, _1), false, true ); - ImageChanged (pv); + ImageChanged (_player_video.first); - _position = pv->time (); - _inter_position = pv->inter_position (); - _inter_size = pv->inter_size (); + _video_position = _player_video.second; + _inter_position = _player_video.first->inter_position (); + _inter_size = _player_video.first->inter_size (); refresh_panel (); -} -void -FilmViewer::get () -{ - Image const * current = _frame.get (); - while (!_player->pass() && _frame.get() == current) {} + _closed_captions_dialog->update (time()); } void FilmViewer::timer () { - DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ()); + if (!_film || !_playing) { + return; + } - if ((_position + frame) >= _film->length ()) { - _play_button->SetValue (false); - check_play_state (); - } else { - get (); + get (); + PositionChanged (); + DCPTime const next = _video_position + one_video_frame(); + + if (next >= _film->length()) { + stop (); } - update_position_label (); - update_position_slider (); + _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT); + + if (_butler) { + _butler->rethrow (); + } } void @@ -270,32 +310,46 @@ FilmViewer::paint_panel () { wxPaintDC dc (_panel); - if (!_frame || !_film || !_out_size.width || !_out_size.height) { + if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) { dc.Clear (); +#ifdef DCPOMATIC_VARIANT_SWAROOP + optional bg = Config::instance()->player_background_image(); + if (bg) { + wxImage image (std_to_wx(bg->string())); + wxBitmap bitmap (image); + dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2)); + } +#endif return; } wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); wxBitmap frame_bitmap (frame); - dc.DrawBitmap (frame_bitmap, 0, 0); + dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2)); + +#ifdef DCPOMATIC_VARIANT_SWAROOP + /* XXX: watermark */ +#endif if (_out_size.width < _panel_size.width) { - wxPen p (GetBackgroundColour ()); - wxBrush b (GetBackgroundColour ()); + wxPen p (_panel->GetParent()->GetBackgroundColour()); + wxBrush b (_panel->GetParent()->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 ()); + wxPen p (_panel->GetParent()->GetBackgroundColour()); + wxBrush b (_panel->GetParent()->GetBackgroundColour()); dc.SetPen (p); dc.SetBrush (b); - dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height); + int const gap = (_panel_size.height - _out_size.height) / 2; + dc.DrawRectangle (0, 0, _panel_size.width, gap); + dc.DrawRectangle (0, gap + _out_size.height, _panel_size.width, gap); } - if (_outline_content->GetValue ()) { + if (_outline_content) { wxPen p (wxColour (255, 0, 0), 2); dc.SetPen (p); dc.SetBrush (*wxTRANSPARENT_BRUSH); @@ -304,19 +358,17 @@ FilmViewer::paint_panel () } void -FilmViewer::slider_moved () +FilmViewer::set_outline_content (bool o) { - if (!_film) { - return; - } + _outline_content = o; + refresh_panel (); +} - 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 ()); - } - seek (t, false); - update_position_label (); +void +FilmViewer::set_eyes (Eyes e) +{ + _eyes = e; + slow_refresh (); } void @@ -326,9 +378,10 @@ FilmViewer::panel_sized (wxSizeEvent& ev) _panel_size.height = ev.GetSize().GetHeight(); calculate_sizes (); - refresh (); - update_position_label (); - update_position_slider (); + if (!quick_refresh()) { + slow_refresh (); + } + PositionChanged (); } void @@ -361,86 +414,141 @@ FilmViewer::calculate_sizes () } void -FilmViewer::play_clicked () +FilmViewer::start () { - check_play_state (); + if (!_film) { + return; + } + + optional v = PlaybackPermitted (); + if (v && !*v) { + /* Computer says no */ + return; + } + + if (_audio.isStreamOpen()) { + _audio.setStreamTime (_video_position.seconds()); + _audio.startStream (); + } + + _playing = true; + _dropped = 0; + timer (); + Started (position()); } -void -FilmViewer::check_play_state () +bool +FilmViewer::stop () { - if (!_film || _film->video_frame_rate() == 0) { - return; + if (_audio.isStreamRunning()) { + /* stop stream and discard any remaining queued samples */ + _audio.abortStream (); } - if (_play_button->GetValue()) { - _timer.Start (1000 / _film->video_frame_rate()); - } else { - _timer.Stop (); + if (!_playing) { + return false; } + + _playing = false; + Stopped (position()); + return true; } void -FilmViewer::update_position_slider () +FilmViewer::player_change (ChangeType type, int property, bool frequent) { - if (!_film) { - _slider->SetValue (0); + if (type != CHANGE_TYPE_DONE || frequent) { return; } - DCPTime const len = _film->length (); + if (_coalesce_player_changes) { + _pending_player_changes.push_back (property); + return; + } - if (len.get ()) { - int const new_slider_position = 4096 * _position.get() / len.get(); - if (new_slider_position != _slider->GetValue()) { - _slider->SetValue (new_slider_position); - } + calculate_sizes (); + bool refreshed = false; + if ( + property == VideoContentProperty::CROP || + property == VideoContentProperty::SCALE || + property == VideoContentProperty::FADE_IN || + property == VideoContentProperty::FADE_OUT || + property == VideoContentProperty::COLOUR_CONVERSION || + property == PlayerProperty::VIDEO_CONTAINER_SIZE || + property == PlayerProperty::FILM_CONTAINER + ) { + refreshed = quick_refresh (); } + + if (!refreshed) { + slow_refresh (); + } + PositionChanged (); } void -FilmViewer::update_position_label () +FilmViewer::film_change (ChangeType type, Film::Property p) { - if (!_film) { - _frame_number->SetLabel ("0"); - _timecode->SetLabel ("0:0:0.0"); - return; + if (type == CHANGE_TYPE_DONE && p == Film::AUDIO_CHANNELS) { + recreate_butler (); } - - 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 (_position.seconds() * fps) + 1)); - _timecode->SetLabel (time_to_timecode (_position, fps)); } +/** Re-get the current frame slowly by seeking */ void -FilmViewer::active_jobs_changed (optional j) +FilmViewer::slow_refresh () { - /* 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); + seek (_video_position, true); } -DCPTime -FilmViewer::nudge_amount (wxMouseEvent& ev) +/** Try to re-get the current frame quickly by resetting the metadata + * in the PlayerVideo that we used last time. + * @return true if this was possible, false if not. + */ +bool +FilmViewer::quick_refresh () { - DCPTime amount = DCPTime::from_frames (1, _film->video_frame_rate ()); + if (!_player_video.first) { + return false; + } + + if (!_player_video.first->reset_metadata (_player->video_container_size(), _film->frame_size())) { + return false; + } - 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); + display_player_video (); + return true; +} + +void +FilmViewer::seek (shared_ptr content, ContentTime t, bool accurate) +{ + optional dt = _player->content_time_to_dcp (content, t); + if (dt) { + seek (*dt, accurate); } +} - return amount; +void +FilmViewer::set_coalesce_player_changes (bool c) +{ + _coalesce_player_changes = c; + + if (!c) { + BOOST_FOREACH (int i, _pending_player_changes) { + player_change (CHANGE_TYPE_DONE, i, false); + } + _pending_player_changes.clear (); + } } void -FilmViewer::go_to (DCPTime t) +FilmViewer::seek (DCPTime t, bool accurate) { + if (!_butler) { + return; + } + if (t < DCPTime ()) { t = DCPTime (); } @@ -449,128 +557,170 @@ FilmViewer::go_to (DCPTime t) t = _film->length (); } - seek (t, true); - update_position_label (); - update_position_slider (); -} + bool const was_running = stop (); -void -FilmViewer::back_clicked (wxMouseEvent& ev) -{ - go_to (_position - nudge_amount (ev)); - ev.Skip (); -} + _closed_captions_dialog->clear (); + _butler->seek (t, accurate); + get (); -void -FilmViewer::forward_clicked (wxMouseEvent& ev) -{ - go_to (_position + nudge_amount (ev)); - ev.Skip (); + if (was_running) { + start (); + } + + PositionChanged (); + Seeked (position()); } void -FilmViewer::player_changed (bool frequent) +FilmViewer::config_changed (Config::Property p) { - if (frequent) { +#ifdef DCPOMATIC_VARIANT_SWAROOP + if (p == Config::PLAYER_BACKGROUND_IMAGE) { + refresh_panel (); return; } +#endif - if (_coalesce_player_changes) { - _pending_player_change = true; + if (p != Config::SOUND && p != Config::SOUND_OUTPUT) { return; } - calculate_sizes (); - refresh (); - update_position_label (); - update_position_slider (); -} + if (_audio.isStreamOpen ()) { + _audio.closeStream (); + } -void -FilmViewer::setup_sensitivity () -{ - bool const c = _film && !_film->content().empty (); + if (Config::instance()->sound() && _audio.getDeviceCount() > 0) { + unsigned int st = 0; + if (Config::instance()->sound_output()) { + while (st < _audio.getDeviceCount()) { + if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) { + break; + } + ++st; + } + if (st == _audio.getDeviceCount()) { + st = _audio.getDefaultOutputDevice(); + } + } else { + st = _audio.getDefaultOutputDevice(); + } - _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); + _audio_channels = _audio.getDeviceInfo(st).outputChannels; + + RtAudio::StreamParameters sp; + sp.deviceId = st; + sp.nChannels = _audio_channels; + sp.firstChannel = 0; + try { + _audio.openStream (&sp, 0, RTAUDIO_FLOAT32, 48000, &_audio_block_size, &rtaudio_callback, this); +#ifdef DCPOMATIC_USE_RTERROR + } catch (RtError& e) { +#else + } catch (RtAudioError& e) { +#endif + error_dialog ( + _panel, + _("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what()) + ); + } + recreate_butler (); - _left_eye->Enable (c && _film->three_d ()); - _right_eye->Enable (c && _film->three_d ()); + } else { + _audio_channels = 0; + recreate_butler (); + } } -void -FilmViewer::film_changed (Film::Property p) +DCPTime +FilmViewer::uncorrected_time () const { - if (p == Film::CONTENT || p == Film::THREE_D) { - setup_sensitivity (); + if (_audio.isStreamRunning ()) { + return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime()); } + + return _video_position; } -/** Re-get the current frame */ -void -FilmViewer::refresh () +DCPTime +FilmViewer::time () const { - seek (_position, _last_seek_accurate); + if (_audio.isStreamRunning ()) { + return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime ()) - + DCPTime::from_frames (average_latency(), _film->audio_frame_rate()); + } + + return _video_position; } -void -FilmViewer::set_position (DCPTime p) +int +FilmViewer::audio_callback (void* out_p, unsigned int frames) { - _position = p; - seek (p, true); - update_position_label (); - update_position_slider (); + 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) { + _latency_history.push_back (_audio.getStreamLatency ()); + if (_latency_history.size() > static_cast (_latency_history_count)) { + _latency_history.pop_front (); + } + } + + return 0; } -void -FilmViewer::set_coalesce_player_changes (bool c) +Frame +FilmViewer::average_latency () const { - _coalesce_player_changes = c; + boost::mutex::scoped_lock lm (_latency_history_mutex); + if (_latency_history.empty()) { + return 0; + } - if (c) { - _pending_player_change = false; - } else { - if (_pending_player_change) { - player_changed (false); - } - } + Frame total = 0; + BOOST_FOREACH (Frame i, _latency_history) { + total += i; + } + + return total / _latency_history.size(); } void -FilmViewer::timecode_clicked () +FilmViewer::set_dcp_decode_reduction (optional reduction) { - PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ()); - if (dialog->ShowModal() == wxID_OK) { - go_to (dialog->get ()); + _dcp_decode_reduction = reduction; + if (_player) { + _player->set_dcp_decode_reduction (reduction); } - dialog->Destroy (); } -void -FilmViewer::frame_number_clicked () +optional +FilmViewer::dcp_decode_reduction () const { - PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ()); - if (dialog->ShowModal() == wxID_OK) { - go_to (dialog->get ()); - } - dialog->Destroy (); + return _dcp_decode_reduction; } +DCPTime +FilmViewer::one_video_frame () const +{ + return DCPTime::from_frames (1, _film->video_frame_rate()); +} + +/** Open a dialog box showing our film's closed captions */ void -FilmViewer::jump_to_selected_clicked () +FilmViewer::show_closed_captions () { - Config::instance()->set_jump_to_selected (_jump_to_selected->GetValue ()); + _closed_captions_dialog->Show(); } void -FilmViewer::seek (DCPTime t, bool accurate) +FilmViewer::seek_by (DCPTime by, bool accurate) { - _player->seek (t, accurate); - _last_seek_accurate = accurate; - get (); + seek (_video_position + by, accurate); }