X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=5b2c5ff95abc78f21a9cbf47314bb9cef4f3eed5;hp=3113a1e057f7a0848315a189e95b8056230b5dc9;hb=6743eacf57a1209270f4021684425865bb72b00f;hpb=23583dfb56181c76126e652042e9d1940367aa27 diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 3113a1e05..5b2c5ff95 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -27,6 +27,8 @@ #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" @@ -43,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 } @@ -65,6 +69,7 @@ using boost::dynamic_pointer_cast; using boost::weak_ptr; using boost::optional; using dcp::Size; +using namespace dcpomatic; static int @@ -73,43 +78,34 @@ 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) - : _panel (new wxPanel (p)) - , _outline_content (0) - , _eye (0) - , _jump_to_selected (0) +FilmViewer::FilmViewer (wxWindow* p) + /* XXX: make this configurable */ +// : _video_view (new GLVideoView(p)) + : _video_view (new SimpleVideoView(this, p)) , _coalesce_player_changes (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); + , _closed_captions_dialog (new ClosedCaptionsDialog(p, this)) + , _outline_content (false) + , _eyes (EYES_LEFT) + , _pad_black (false) +#ifdef DCPOMATIC_VARIANT_SWAROOP + , _in_watermark (false) + , _background_image (false) #endif - - _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); - - _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)); - } - _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this)); + , _state_timer ("viewer") + , _gets (0) +{ + /* XXX: maybe this should be proxied through the VideoView */ + _video_view->get()->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::video_view_sized, this)); + _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, 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); } @@ -127,6 +123,9 @@ FilmViewer::set_film (shared_ptr film) } _film = film; + _video_position = DCPTime (); + _player_video.first.reset (); + _player_video.second = DCPTime (); _frame.reset (); _closed_captions_dialog->clear (); @@ -135,7 +134,7 @@ FilmViewer::set_film (shared_ptr film) _player.reset (); recreate_butler (); _frame.reset (); - refresh_panel (); + refresh_view (); return; } @@ -145,8 +144,8 @@ 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; } @@ -164,8 +163,6 @@ FilmViewer::set_film (shared_ptr film) calculate_sizes (); slow_refresh (); - - setup_sensitivity (); } void @@ -199,12 +196,12 @@ FilmViewer::recreate_butler () map.set (dcp::RS, 1, 1 / sqrt(2)); // Rs -> Rt } - _butler.reset (new Butler (_player, _film->log(), map, _audio_channels)); + _butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)); if (!Config::instance()->sound() && !_audio.isStreamOpen()) { _butler->disable_audio (); } - _closed_captions_dialog->set_butler (_butler); + _closed_captions_dialog->set_film_and_butler (_film, _butler); if (was_running) { start (); @@ -212,16 +209,19 @@ FilmViewer::recreate_butler () } void -FilmViewer::refresh_panel () +FilmViewer::refresh_view () { - _panel->Refresh (); - _panel->Update (); + _state_timer.set ("refresh-view"); + _video_view->get()->Refresh (); + _video_view->get()->Update (); + _state_timer.unset (); } void FilmViewer::get () { DCPOMATIC_ASSERT (_butler); + ++_gets; do { Butler::Error e; @@ -233,7 +233,8 @@ FilmViewer::get () } 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 (); @@ -246,7 +247,7 @@ FilmViewer::display_player_video () { if (!_player_video.first) { _frame.reset (); - refresh_panel (); + refresh_view (); return; } @@ -273,23 +274,25 @@ 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"); + /* XXX: do we need to store _frame? */ + _frame = _player_video.first->image (bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true); + _video_view->set_image (_frame); + + _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 (); + refresh_view (); _closed_captions_dialog->update (time()); } @@ -302,14 +305,16 @@ FilmViewer::timer () } get (); - update_position_label (); - update_position_slider (); + PositionChanged (); DCPTime const next = _video_position + one_video_frame(); if (next >= _film->length()) { stop (); + Finished (); + return; } + LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), time().seconds(), max((next.seconds() - time().seconds()) * 1000, 1.0)); _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT); if (_butler) { @@ -317,56 +322,50 @@ FilmViewer::timer () } } -void -FilmViewer::paint_panel () +bool +#ifdef DCPOMATIC_VARIANT_SWAROOP +XXX +FilmViewer::maybe_draw_background_image (wxPaintDC& dc) { - 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); + 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)); + return true; } - 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); - } + return false; +} +#else +FilmViewer::maybe_draw_background_image (wxPaintDC &) +{ + return false; +} +#endif - 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); - } +void +FilmViewer::set_outline_content (bool o) +{ + _outline_content = o; + refresh_view (); } void -FilmViewer::panel_sized (wxSizeEvent& ev) +FilmViewer::set_eyes (Eyes e) { - _panel_size.width = ev.GetSize().GetWidth(); - _panel_size.height = ev.GetSize().GetHeight(); + _eyes = e; + slow_refresh (); +} +void +FilmViewer::video_view_sized () +{ calculate_sizes (); if (!quick_refresh()) { slow_refresh (); } - update_position_label (); - update_position_slider (); + PositionChanged (); } void @@ -378,16 +377,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); } @@ -395,6 +394,10 @@ FilmViewer::calculate_sizes () _out_size.width = max (64, _out_size.width); _out_size.height = max (64, _out_size.height); + /* Make OpenGL happy; XXX: only do this in GLVideoView? Is the round-to-4 constraint a thing? */ + _out_size.width &= ~3; + _out_size.height &= ~3; + _player->set_video_container_size (_out_size); } @@ -405,6 +408,12 @@ FilmViewer::start () return; } + optional v = PlaybackPermitted (); + if (v && !*v) { + /* Computer says no */ + return; + } + if (_audio.isStreamOpen()) { _audio.setStreamTime (_video_position.seconds()); _audio.startStream (); @@ -413,7 +422,7 @@ FilmViewer::start () _playing = true; _dropped = 0; timer (); - _play_button->SetValue (true); + Started (position()); } bool @@ -429,26 +438,10 @@ FilmViewer::stop () } _playing = false; - _play_button->SetValue (false); + Stopped (position()); return true; } -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::player_change (ChangeType type, int property, bool frequent) { @@ -478,20 +471,13 @@ FilmViewer::player_change (ChangeType type, int property, bool frequent) if (!refreshed) { slow_refresh (); } - update_position_label (); - update_position_slider (); + PositionChanged (); } void FilmViewer::film_change (ChangeType type, Film::Property p) { - if (type != CHANGE_TYPE_DONE) { - return; - } - - 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 (); } } @@ -514,7 +500,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; } @@ -523,20 +509,11 @@ 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) { optional dt = _player->content_time_to_dcp (content, t); if (dt) { - set_position (*dt); + seek (*dt, accurate); } } @@ -560,6 +537,14 @@ FilmViewer::seek (DCPTime t, bool accurate) return; } + if (t < DCPTime ()) { + t = DCPTime (); + } + + if (t >= _film->length ()) { + t = _film->length (); + } + bool const was_running = stop (); _closed_captions_dialog->clear (); @@ -569,11 +554,20 @@ FilmViewer::seek (DCPTime t, bool accurate) if (was_running) { start (); } + + PositionChanged (); } void FilmViewer::config_changed (Config::Property p) { +#ifdef DCPOMATIC_VARIANT_SWAROOP + if (p == Config::PLAYER_BACKGROUND_IMAGE) { + refresh_view (); + return; + } +#endif + if (p != Config::SOUND && p != Config::SOUND_OUTPUT) { return; } @@ -612,7 +606,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()) ); } @@ -705,6 +699,7 @@ 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::show_closed_captions () { @@ -712,11 +707,13 @@ FilmViewer::show_closed_captions () } void -FilmViewer::back_frame (DCPTime by) +FilmViewer::seek_by (DCPTime by, bool accurate) { - if (!_film) { - return; - } + seek (_video_position + by, accurate); +} - go_to (_video_position + by); +void +FilmViewer::set_pad_black (bool p) +{ + _pad_black = p; }