X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=3b6ea5b39fa4f2095ceb2b9275e57eb3ff7df092;hb=2897d0a5912144486294dadca9a72df593c0f0f9;hp=3d9ec036b2ebb97044fe889a8d5bb25a1a038032;hpb=fe99d14e3047e9302e94db372923c92291016f1c;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 3d9ec036b..3b6ea5b39 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-2017 Carl Hetherington This file is part of DCP-o-matic. @@ -72,14 +72,15 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS return reinterpret_cast(data)->audio_callback (out, frames); } -FilmViewer::FilmViewer (wxWindow* p) +FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected) : wxPanel (p) , _panel (new wxPanel (this)) - , _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content"))) + , _outline_content (0) , _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"))) + , _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(""))) @@ -87,11 +88,12 @@ FilmViewer::FilmViewer (wxWindow* p) , _play_button (new wxToggleButton (this, wxID_ANY, _("Play"))) , _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) { #ifndef __WXOSX__ _panel->SetDoubleBuffered (true); @@ -105,10 +107,16 @@ FilmViewer::FilmViewer (wxWindow* p) _v_sizer->Add (_panel, 1, wxEXPAND); wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL); - view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP); + if (outline_content) { + _outline_content = new wxCheckBox (this, wxID_ANY, _("Outline content")); + 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); + 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, DCPOMATIC_SIZER_GAP); + } _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP); wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); @@ -117,6 +125,7 @@ FilmViewer::FilmViewer (wxWindow* p) 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); @@ -126,26 +135,32 @@ FilmViewer::FilmViewer (wxWindow* p) _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)); - _outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::refresh_panel, this)); + if (_outline_content) { + _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)); + _slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&FilmViewer::slider_moved, this, false)); + _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind (&FilmViewer::slider_moved, this, false)); + _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind (&FilmViewer::slider_moved, this, false)); + _slider->Bind (wxEVT_SCROLL_CHANGED, boost::bind (&FilmViewer::slider_moved, this, true)); _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)); - _jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::jump_to_selected_clicked, this)); - - _jump_to_selected->SetValue (Config::instance()->jump_to_selected ()); + 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 ()); + } set_film (shared_ptr ()); @@ -179,12 +194,19 @@ FilmViewer::set_film (shared_ptr film) update_position_label (); 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.")); _film.reset (); @@ -195,12 +217,14 @@ FilmViewer::set_film (shared_ptr film) in the preview. */ _player->set_always_burn_subtitles (true); - _player->set_ignore_audio (); _player->set_play_referenced (); _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1)); _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1)); + /* Keep about 1 second's worth of history samples */ + _latency_history_count = _film->audio_frame_rate() / _audio_block_size; + recreate_butler (); calculate_sizes (); @@ -235,7 +259,10 @@ FilmViewer::recreate_butler () map.set (2, 1, 1 / sqrt(2)); // C -> R } - _butler.reset (new Butler (_film, _player, map, _audio_channels)); + _butler.reset (new Butler (_player, _film->log(), map, _audio_channels)); + if (!Config::instance()->sound() && !_audio.isStreamOpen()) { + _butler->disable_audio (); + } if (was_running) { start (); @@ -252,14 +279,30 @@ FilmViewer::refresh_panel () void FilmViewer::get () { - cout << "get!\n"; + DCPOMATIC_ASSERT (_butler); pair, DCPTime> video; do { video = _butler->get_video (); - } while (_film->three_d() && ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT))); + } while ( + _film->three_d() && + ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT)) + ); + + _butler->rethrow (); if (!video.first) { + _frame.reset (); + refresh_panel (); + return; + } + + if (_playing && (time() - 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 = video.second; + ++_dropped; return; } @@ -299,17 +342,23 @@ FilmViewer::get () void FilmViewer::timer () { - if (!_film) { + if (!_film || !_playing) { return; } - if (_audio.isStreamRunning ()) { - DCPTime const now = time().ceil (_film->video_frame_rate ()); - get (); - update_position_label (); - update_position_slider (); - DCPTime const next = now + DCPTime::from_frames (1, _film->video_frame_rate ()); - _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 0.0), wxTIMER_ONE_SHOT); + 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 (); } } @@ -343,7 +392,7 @@ FilmViewer::paint_panel () dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height); } - if (_outline_content->GetValue ()) { + if (_outline_content && _outline_content->GetValue ()) { wxPen p (wxColour (255, 0, 0), 2); dc.SetPen (p); dc.SetBrush (*wxTRANSPARENT_BRUSH); @@ -352,19 +401,23 @@ FilmViewer::paint_panel () } void -FilmViewer::slider_moved () +FilmViewer::slider_moved (bool update_slider) { 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 ()); + t = _film->length() - one_video_frame(); } seek (t, false); update_position_label (); + if (update_slider) { + update_position_slider (); + } } void @@ -422,9 +475,9 @@ FilmViewer::check_play_state () } if (_play_button->GetValue()) { - _timer.Start (1000 / _film->video_frame_rate()); + start (); } else { - _timer.Stop (); + stop (); } } @@ -437,7 +490,8 @@ FilmViewer::start () } _playing = true; - _timer.Start (0, wxTIMER_ONE_SHOT); + _dropped = 0; + timer (); } bool @@ -453,6 +507,7 @@ FilmViewer::stop () } _playing = false; + _play_button->SetValue (false); return true; } @@ -501,7 +556,7 @@ FilmViewer::active_jobs_changed (optional j) DCPTime FilmViewer::nudge_amount (wxMouseEvent& ev) { - DCPTime amount = DCPTime::from_frames (1, _film->video_frame_rate ()); + DCPTime amount = one_video_frame (); if (ev.ShiftDown() && !ev.ControlDown()) { amount = DCPTime::from_seconds (1); @@ -530,6 +585,13 @@ FilmViewer::go_to (DCPTime t) update_position_slider (); } +void +FilmViewer::rewind_clicked (wxMouseEvent& ev) +{ + go_to(DCPTime()); + ev.Skip(); +} + void FilmViewer::back_clicked (wxMouseEvent& ev) { @@ -568,12 +630,18 @@ 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); - _outline_content->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); + } _left_eye->Enable (c && _film->three_d ()); _right_eye->Enable (c && _film->three_d ()); @@ -591,7 +659,7 @@ FilmViewer::film_changed (Film::Property p) void FilmViewer::refresh () { - seek (_video_position, _last_seek_accurate); + seek (_video_position, true); } void @@ -650,15 +718,20 @@ FilmViewer::seek (DCPTime t, bool accurate) return; } + bool const was_running = stop (); + _butler->seek (t, accurate); - _last_seek_accurate = accurate; get (); + + if (was_running) { + start (); + } } void FilmViewer::config_changed (Config::Property p) { - if (p != Config::SOUND_OUTPUT) { + if (p != Config::SOUND && p != Config::SOUND_OUTPUT) { return; } @@ -666,36 +739,45 @@ FilmViewer::config_changed (Config::Property p) _audio.closeStream (); } - unsigned int st = 0; - if (Config::instance()->sound_output()) { - while (st < _audio.getDeviceCount()) { - if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) { - break; + if (Config::instance()->sound()) { + 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; } - ++st; - } - if (st == _audio.getDeviceCount()) { + if (st == _audio.getDeviceCount()) { + st = _audio.getDefaultOutputDevice(); + } + } else { st = _audio.getDefaultOutputDevice(); } - } else { - st = _audio.getDefaultOutputDevice(); - } - _audio_channels = _audio.getDeviceInfo(st).outputChannels; - recreate_butler (); + _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); + 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) { + } catch (RtError& e) { #else - } catch (RtAudioError& e) { + } catch (RtAudioError& e) { #endif - error_dialog (this, wxString::Format (_("Could not set up audio output (%s). There will be no audio during the preview."), e.what())); + error_dialog ( + this, + wxString::Format (_("Could not set up audio output (%s). There will be no audio during the preview."), e.what()) + ); + } + recreate_butler (); + + } else { + _audio_channels = 0; + recreate_butler (); } } @@ -703,7 +785,8 @@ DCPTime FilmViewer::time () const { if (_audio.isStreamRunning ()) { - return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime ()); + return DCPTime::from_seconds (const_cast(&_audio)->getStreamTime ()) - + DCPTime::from_frames (average_latency(), _film->audio_frame_rate()); } return _video_position; @@ -713,5 +796,51 @@ int FilmViewer::audio_callback (void* out_p, unsigned int frames) { _butler->get_audio (reinterpret_cast (out_p), frames); + + 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; } + +Frame +FilmViewer::average_latency () const +{ + boost::mutex::scoped_lock lm (_latency_history_mutex); + if (_latency_history.empty()) { + return 0; + } + + Frame total = 0; + BOOST_FOREACH (Frame i, _latency_history) { + total += i; + } + + return total / _latency_history.size(); +} + +void +FilmViewer::set_dcp_decode_reduction (optional reduction) +{ + _dcp_decode_reduction = reduction; + if (_player) { + _player->set_dcp_decode_reduction (reduction); + } +} + +optional +FilmViewer::dcp_decode_reduction () const +{ + return _dcp_decode_reduction; +} + +DCPTime +FilmViewer::one_video_frame () const +{ + return DCPTime::from_frames (1, _film->video_frame_rate()); +}