X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=9493a55c9ee7c949098dd28643cab9277f4ee899;hb=5c747071407b9f52a7aafbc40b91621858e5396b;hp=a326cfa0b2dbb0fa36cce25213277672e6ac0601;hpb=f0a9735731740bf9da24847294d9781f1bc3a331;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index a326cfa0b..9493a55c9 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -72,13 +72,13 @@ 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)) , _back_button (new wxButton (this, wxID_ANY, wxT("<"))) , _forward_button (new wxButton (this, wxID_ANY, wxT(">"))) @@ -93,6 +93,7 @@ FilmViewer::FilmViewer (wxWindow* p) , _audio_block_size (1024) , _playing (false) , _latency_history_count (0) + , _dropped (0) { #ifndef __WXOSX__ _panel->SetDoubleBuffered (true); @@ -106,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); @@ -132,19 +139,25 @@ FilmViewer::FilmViewer (wxWindow* p) _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_CHANGED, 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)); _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 ()); @@ -155,7 +168,7 @@ FilmViewer::FilmViewer (wxWindow* p) setup_sensitivity (); _config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1)); - config_changed (Config::PREVIEW_SOUND_OUTPUT); + config_changed (Config::SOUND_OUTPUT); } FilmViewer::~FilmViewer () @@ -184,6 +197,9 @@ FilmViewer::set_film (shared_ptr film) 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 (); @@ -236,8 +252,8 @@ FilmViewer::recreate_butler () map.set (2, 1, 1 / sqrt(2)); // C -> R } - _butler.reset (new Butler (_film, _player, map, _audio_channels)); - if (!Config::instance()->preview_sound()) { + _butler.reset (new Butler (_player, _film->log(), map, _audio_channels)); + if (!Config::instance()->sound()) { _butler->disable_audio (); } @@ -274,6 +290,15 @@ FilmViewer::get () return; } + if ((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; + } + /* In an ideal world, what we would do here is: * * 1. convert to XYZ exactly as we do in the DCP creation path. @@ -317,7 +342,7 @@ FilmViewer::timer () get (); update_position_label (); update_position_slider (); - DCPTime const next = _video_position + DCPTime::from_frames (1, _film->video_frame_rate ()); + DCPTime const next = _video_position + one_video_frame(); if (next >= _film->length()) { stop (); @@ -360,7 +385,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); @@ -369,20 +394,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 (); - update_position_slider (); + if (update_slider) { + update_position_slider (); + } } void @@ -455,6 +483,7 @@ FilmViewer::start () } _playing = true; + _dropped = 0; timer (); } @@ -520,7 +549,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); @@ -590,10 +619,14 @@ FilmViewer::setup_sensitivity () _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); - _jump_to_selected->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 ()); @@ -684,7 +717,7 @@ FilmViewer::seek (DCPTime t, bool accurate) void FilmViewer::config_changed (Config::Property p) { - if (p != Config::PREVIEW_SOUND && p != Config::PREVIEW_SOUND_OUTPUT) { + if (p != Config::SOUND && p != Config::SOUND_OUTPUT) { return; } @@ -692,11 +725,11 @@ FilmViewer::config_changed (Config::Property p) _audio.closeStream (); } - if (Config::instance()->preview_sound()) { + if (Config::instance()->sound()) { unsigned int st = 0; - if (Config::instance()->preview_sound_output()) { + if (Config::instance()->sound_output()) { while (st < _audio.getDeviceCount()) { - if (_audio.getDeviceInfo(st).name == Config::instance()->preview_sound_output().get()) { + if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) { break; } ++st; @@ -777,3 +810,18 @@ FilmViewer::average_latency () const 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); + } +} + +DCPTime +FilmViewer::one_video_frame () const +{ + return DCPTime::from_frames (1, _film->video_frame_rate()); +}