X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=3113a1e057f7a0848315a189e95b8056230b5dc9;hb=23583dfb56181c76126e652042e9d1940367aa27;hp=5c218ae44e3b77b1e4c8b7b6006bc334c7e39fec;hpb=a203b32e34f7d8b2155d1d48f392112a5db8825d;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 5c218ae44..3113a1e05 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-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" @@ -73,27 +74,20 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS } FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected) - : wxPanel (p) - , _panel (new wxPanel (this)) + : _panel (new wxPanel (p)) , _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"))) + , _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) - , _pending_player_change (false) + , _slider_being_moved (false) + , _was_running_before_slider (false) , _audio (DCPOMATIC_RTAUDIO_API) , _audio_channels (0) , _audio_block_size (1024) , _playing (false) , _latency_history_count (0) , _dropped (0) + , _closed_captions_dialog (new ClosedCaptionsDialog(GetParent())) { #ifndef __WXOSX__ _panel->SetDoubleBuffered (true); @@ -101,66 +95,12 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected _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, 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); - 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); - - 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)); + _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)); - } - _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, 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)); - 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 ()); + _outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::refresh_panel, this)); } + _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this)); set_film (shared_ptr ()); @@ -189,9 +129,7 @@ FilmViewer::set_film (shared_ptr film) _film = film; _frame.reset (); - - update_position_slider (); - update_position_label (); + _closed_captions_dialog->clear (); if (!_film) { _player.reset (); @@ -213,14 +151,11 @@ FilmViewer::set_film (shared_ptr film) 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_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)); + _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; @@ -228,7 +163,7 @@ FilmViewer::set_film (shared_ptr film) recreate_butler (); calculate_sizes (); - refresh (); + slow_refresh (); setup_sensitivity (); } @@ -250,13 +185,18 @@ FilmViewer::recreate_butler () map.set (i, i, 1); } } else { - /* Special case: stereo output, at least 3 channel input, map L+R to L/R and - C to both, all 3dB down. + /* 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 (0, 0, 1 / sqrt(2)); // L -> L - map.set (1, 1, 1 / sqrt(2)); // R -> R - map.set (2, 0, 1 / sqrt(2)); // C -> L - map.set (2, 1, 1 / sqrt(2)); // C -> R + 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)); @@ -264,6 +204,8 @@ FilmViewer::recreate_butler () _butler->disable_audio (); } + _closed_captions_dialog->set_butler (_butler); + if (was_running) { start (); } @@ -281,27 +223,38 @@ FilmViewer::get () { DCPOMATIC_ASSERT (_butler); - pair, DCPTime> video; do { - video = _butler->get_video (); + 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() && - ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT)) + ((_eye->GetSelection() == 0 && _player_video.first->eyes() == EYES_RIGHT) || (_eye->GetSelection() == 1 && _player_video.first->eyes() == EYES_LEFT)) ); _butler->rethrow (); - if (!video.first) { + display_player_video (); +} + +void +FilmViewer::display_player_video () +{ + if (!_player_video.first) { _frame.reset (); refresh_panel (); return; } - if (_playing && (time() - video.second) > one_video_frame()) { + 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 = video.second; + _video_position = _player_video.second; ++_dropped; return; } @@ -324,19 +277,21 @@ FilmViewer::get () * image and convert it (from whatever the user has said it is) to RGB. */ - _frame = video.first->image ( + _frame = _player_video.first->image ( bind (&Log::dcp_log, _film->log().get(), _1, _2), bind (&PlayerVideo::always_rgb, _1), false, true ); - ImageChanged (video.first); + ImageChanged (_player_video.first); - _video_position = video.second; - _inter_position = video.first->inter_position (); - _inter_size = video.first->inter_size (); + _video_position = _player_video.second; + _inter_position = _player_video.first->inter_position (); + _inter_size = _player_video.first->inter_size (); refresh_panel (); + + _closed_captions_dialog->update (time()); } void @@ -367,7 +322,7 @@ 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 (); return; } @@ -400,26 +355,6 @@ FilmViewer::paint_panel () } } -void -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() - one_video_frame(); - } - seek (t, false); - update_position_label (); - if (update_slider) { - update_position_slider (); - } -} - void FilmViewer::panel_sized (wxSizeEvent& ev) { @@ -427,7 +362,9 @@ FilmViewer::panel_sized (wxSizeEvent& ev) _panel_size.height = ev.GetSize().GetHeight(); calculate_sizes (); - refresh (); + if (!quick_refresh()) { + slow_refresh (); + } update_position_label (); update_position_slider (); } @@ -435,7 +372,7 @@ FilmViewer::panel_sized (wxSizeEvent& ev) void FilmViewer::calculate_sizes () { - if (!_film) { + if (!_film || !_player) { return; } @@ -462,28 +399,12 @@ FilmViewer::calculate_sizes () } void -FilmViewer::play_clicked () -{ - check_play_state (); -} - -void -FilmViewer::check_play_state () +FilmViewer::start () { - if (!_film || _film->video_frame_rate() == 0) { + if (!_film) { return; } - if (_play_button->GetValue()) { - start (); - } else { - stop (); - } -} - -void -FilmViewer::start () -{ if (_audio.isStreamOpen()) { _audio.setStreamTime (_video_position.seconds()); _audio.startStream (); @@ -512,64 +433,6 @@ FilmViewer::stop () 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 (wxMouseEvent& 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) { @@ -587,82 +450,78 @@ FilmViewer::go_to (DCPTime t) } void -FilmViewer::rewind_clicked (wxMouseEvent& ev) -{ - go_to(DCPTime()); - ev.Skip(); -} - -void -FilmViewer::back_clicked (wxMouseEvent& ev) +FilmViewer::player_change (ChangeType type, int property, bool frequent) { - go_to (_video_position - nudge_amount (ev)); - ev.Skip (); -} - -void -FilmViewer::forward_clicked (wxMouseEvent& ev) -{ - go_to (_video_position + nudge_amount (ev)); - ev.Skip (); -} - -void -FilmViewer::player_changed (bool frequent) -{ - if (frequent) { + if (type != CHANGE_TYPE_DONE || frequent) { return; } if (_coalesce_player_changes) { - _pending_player_change = true; + _pending_player_changes.push_back (property); return; } calculate_sizes (); - refresh (); + 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 (); + } update_position_label (); update_position_slider (); } void -FilmViewer::setup_sensitivity () +FilmViewer::film_change (ChangeType type, Film::Property p) { - 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); + if (type != CHANGE_TYPE_DONE) { + return; } - _left_eye->Enable (c && _film->three_d ()); - _right_eye->Enable (c && _film->three_d ()); -} - -void -FilmViewer::film_changed (Film::Property p) -{ if (p == Film::CONTENT || p == Film::THREE_D) { setup_sensitivity (); + } else if (p == Film::AUDIO_CHANNELS) { + recreate_butler (); } } -/** Re-get the current frame */ +/** Re-get the current frame slowly by seeking */ void -FilmViewer::refresh () +FilmViewer::slow_refresh () { seek (_video_position, true); } +/** 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 () +{ + if (!_player_video.first) { + return false; + } + + if (!_player_video.first->reset_metadata (_player->video_container_size(), _film->frame_size())) { + return false; + } + + display_player_video (); + return true; +} + void FilmViewer::set_position (DCPTime p) { @@ -673,43 +532,25 @@ FilmViewer::set_position (DCPTime p) } void -FilmViewer::set_coalesce_player_changes (bool c) +FilmViewer::set_position (shared_ptr content, ContentTime t) { - _coalesce_player_changes = c; - - if (c) { - _pending_player_change = false; - } else { - if (_pending_player_change) { - player_changed (false); - } + optional dt = _player->content_time_to_dcp (content, t); + if (dt) { + set_position (*dt); } } void -FilmViewer::timecode_clicked () +FilmViewer::set_coalesce_player_changes (bool c) { - PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ()); - if (dialog->ShowModal() == wxID_OK) { - go_to (dialog->get ()); - } - dialog->Destroy (); -} + _coalesce_player_changes = c; -void -FilmViewer::frame_number_clicked () -{ - PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ()); - if (dialog->ShowModal() == wxID_OK) { - go_to (dialog->get ()); + if (!c) { + BOOST_FOREACH (int i, _pending_player_changes) { + player_change (CHANGE_TYPE_DONE, i, false); + } + _pending_player_changes.clear (); } - dialog->Destroy (); -} - -void -FilmViewer::jump_to_selected_clicked () -{ - Config::instance()->set_jump_to_selected (_jump_to_selected->GetValue ()); } void @@ -721,6 +562,7 @@ FilmViewer::seek (DCPTime t, bool accurate) bool const was_running = stop (); + _closed_captions_dialog->clear (); _butler->seek (t, accurate); get (); @@ -740,7 +582,7 @@ FilmViewer::config_changed (Config::Property p) _audio.closeStream (); } - if (Config::instance()->sound()) { + if (Config::instance()->sound() && _audio.getDeviceCount() > 0) { unsigned int st = 0; if (Config::instance()->sound_output()) { while (st < _audio.getDeviceCount()) { @@ -782,6 +624,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 { @@ -796,7 +648,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) { @@ -845,3 +704,19 @@ FilmViewer::one_video_frame () const { return DCPTime::from_frames (1, _film->video_frame_rate()); } + +void +FilmViewer::show_closed_captions () +{ + _closed_captions_dialog->Show(); +} + +void +FilmViewer::back_frame (DCPTime by) +{ + if (!_film) { + return; + } + + go_to (_video_position + by); +}