X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=edb451e74b8f1ce15d1947dc7792651342258f83;hp=c062524e93fce32db1d51a4a1de90a66d4e1fa4f;hb=335ef709439cd3678f6813a3fb880110e4c9cb26;hpb=15895d47cebc0988aecf0a6b84947f4b6bae9aa3 diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index c062524e9..edb451e74 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 @@ -74,28 +79,34 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS } FilmViewer::FilmViewer (wxWindow* p) - : _panel (new wxPanel (p)) - , _coalesce_player_changes (false) + : _coalesce_player_changes (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(p)) + , _closed_captions_dialog (new ClosedCaptionsDialog(p, this)) , _outline_content (false) , _eyes (EYES_LEFT) -{ -#ifndef __WXOSX__ - _panel->SetDoubleBuffered (true); + , _pad_black (false) +#ifdef DCPOMATIC_VARIANT_SWAROOP + , _background_image (false) #endif + , _state_timer ("viewer") + , _gets (0) +{ + switch (Config::instance()->video_view_type()) { + case Config::VIDEO_VIEW_OPENGL: + _video_view = new GLVideoView (this, p); + break; + case Config::VIDEO_VIEW_SIMPLE: + _video_view = new SimpleVideoView (this, p); + break; + } - _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); - _panel->SetBackgroundColour (*wxBLACK); - - _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)); + _video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this)); + _timer.Bind (wxEVT_TIMER, boost::bind(&FilmViewer::timer, this)); set_film (shared_ptr ()); @@ -116,17 +127,17 @@ FilmViewer::set_film (shared_ptr film) } _film = film; + _video_position = DCPTime (); + _player_video.first.reset (); + _player_video.second = DCPTime (); - FilmChanged (); - - _frame.reset (); + _video_view->set_image (shared_ptr()); _closed_captions_dialog->clear (); if (!_film) { _player.reset (); recreate_butler (); - _frame.reset (); - refresh_panel (); + refresh_view (); return; } @@ -136,8 +147,8 @@ FilmViewer::set_film (shared_ptr film) if (_dcp_decode_reduction) { _player->set_dcp_decode_reduction (_dcp_decode_reduction); } - } catch (bad_alloc) { - error_dialog (_panel, _("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; } @@ -178,22 +189,34 @@ FilmViewer::recreate_butler () 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 + if (_film->audio_channels() > 0) { + map.set (dcp::LEFT, 0, 1 / sqrt(2)); // L -> Lt + } + if (_film->audio_channels() > 1) { + map.set (dcp::RIGHT, 1, 1 / sqrt(2)); // R -> Rt + } + if (_film->audio_channels() > 2) { + map.set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt + map.set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt + } + if (_film->audio_channels() > 3) { + map.set (dcp::LFE, 0, 1 / sqrt(10)); // Lfe -> Lt + map.set (dcp::LFE, 1, 1 / sqrt(10)); // Lfe -> Rt + } + if (_film->audio_channels() > 4) { + map.set (dcp::LS, 0, 1 / sqrt(2)); // Ls -> Lt + } + if (_film->audio_channels() > 5) { + 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 (); @@ -201,41 +224,57 @@ FilmViewer::recreate_butler () } void -FilmViewer::refresh_panel () +FilmViewer::refresh_view () { - _panel->Refresh (); - _panel->Update (); + _state_timer.set ("update-view"); + _video_view->update (); + _state_timer.unset (); } +/** @param lazy true if it is *not* important that the display be updated as quickly as possible. + * If lazy is true we will try to return from this method quickly and postpone any time-consuming + * work until the UI is next idle. Otherwise we will block here and try to get the image on + * screen as soon as possible. + */ void -FilmViewer::get () +FilmViewer::get (bool lazy) { DCPOMATIC_ASSERT (_butler); + ++_gets; do { Butler::Error e; - _player_video = _butler->get_video (&e); + _player_video = _butler->get_video (!lazy, &e); if (!_player_video.first && e == Butler::AGAIN) { - signal_manager->when_idle (boost::bind(&FilmViewer::get, this)); + signal_manager->when_idle (boost::bind(&FilmViewer::get, this, lazy)); return; } } while ( _player_video.first && _film->three_d() && - (_eyes != _player_video.first->eyes()) + _eyes != _player_video.first->eyes() && + _player_video.first->eyes() != EYES_BOTH ); - _butler->rethrow (); + try { + _butler->rethrow (); + } catch (DecodeError& e) { + error_dialog (_video_view->get(), e.what()); + } - display_player_video (); + if (lazy) { + signal_manager->when_idle (boost::bind(&FilmViewer::display_player_video, this)); + } else { + display_player_video (); + } } void FilmViewer::display_player_video () { if (!_player_video.first) { - _frame.reset (); - refresh_panel (); + _video_view->set_image (shared_ptr()); + refresh_view (); return; } @@ -262,23 +301,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"); + + _video_view->set_image ( + _player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true) ); + _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()); } @@ -290,14 +331,17 @@ FilmViewer::timer () return; } - get (); + get (false); 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) { @@ -305,49 +349,11 @@ FilmViewer::timer () } } -void -FilmViewer::paint_panel () -{ - 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 (_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 (_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); - } - - if (_outline_content) { - 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_panel (); + refresh_view (); } void @@ -358,11 +364,8 @@ FilmViewer::set_eyes (Eyes e) } void -FilmViewer::panel_sized (wxSizeEvent& ev) +FilmViewer::video_view_sized () { - _panel_size.width = ev.GetSize().GetWidth(); - _panel_size.height = ev.GetSize().GetHeight(); - calculate_sizes (); if (!quick_refresh()) { slow_refresh (); @@ -379,16 +382,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); } @@ -406,6 +409,12 @@ FilmViewer::start () return; } + optional v = PlaybackPermitted (); + if (v && !*v) { + /* Computer says no */ + return; + } + if (_audio.isStreamOpen()) { _audio.setStreamTime (_video_position.seconds()); _audio.startStream (); @@ -414,7 +423,7 @@ FilmViewer::start () _playing = true; _dropped = 0; timer (); - Started (); + Started (position()); } bool @@ -430,7 +439,7 @@ FilmViewer::stop () } _playing = false; - Stopped (); + Stopped (position()); return true; } @@ -492,7 +501,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; } @@ -541,7 +550,7 @@ FilmViewer::seek (DCPTime t, bool accurate) _closed_captions_dialog->clear (); _butler->seek (t, accurate); - get (); + get (true); if (was_running) { start (); @@ -553,6 +562,13 @@ FilmViewer::seek (DCPTime t, bool accurate) 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; } @@ -591,7 +607,7 @@ FilmViewer::config_changed (Config::Property p) } catch (RtAudioError& e) { #endif error_dialog ( - _panel, + _video_view->get(), _("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what()) ); } @@ -696,3 +712,9 @@ FilmViewer::seek_by (DCPTime by, bool accurate) { seek (_video_position + by, accurate); } + +void +FilmViewer::set_pad_black (bool p) +{ + _pad_black = p; +}