X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=0b6fcd7b353b1fb6cc869c21b6880a1967ad2f76;hp=85b0effbee8c223483f9d6bfbcc84ae1552b755a;hb=7c33cdd95a23ff784c0e0731a9d1444ce9bb8f09;hpb=195eb8204245c7b7765831d1cc1de295b63eb8a2 diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 85b0effbe..0b6fcd7b3 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,27 +79,35 @@ 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) + , _suspended (0) , _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) + , _idle_get (false) +{ + 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->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)); set_film (shared_ptr ()); @@ -107,6 +120,34 @@ FilmViewer::~FilmViewer () stop (); } +/** Ask for ::get() to be called next time we are idle */ +void +FilmViewer::request_idle_get () +{ + if (_idle_get) { + return; + } + + _idle_get = true; + DCPOMATIC_ASSERT (signal_manager); + signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this)); +} + +void +FilmViewer::idle_handler () +{ + if (!_idle_get) { + return; + } + + if (_video_view->get(true)) { + _idle_get = false; + } else { + /* get() could not complete quickly so we'll try again later */ + signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this)); + } +} + void FilmViewer::set_film (shared_ptr film) { @@ -115,15 +156,17 @@ FilmViewer::set_film (shared_ptr film) } _film = film; + _video_position = DCPTime (); + _player_video.first.reset (); + _player_video.second = DCPTime (); - _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; } @@ -133,8 +176,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; } @@ -157,86 +200,52 @@ FilmViewer::set_film (shared_ptr film) void FilmViewer::recreate_butler () { - bool const was_running = stop (); + suspend (); _butler.reset (); if (!_film) { + resume (); return; } - AudioMapping map = AudioMapping (_film->audio_channels(), _audio_channels); - - if (_audio_channels != 2 || _film->audio_channels() < 3) { - for (int i = 0; i < min (_film->audio_channels(), _audio_channels); ++i) { - map.set (i, i, 1); - } - } else { - /* 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 (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, + Config::instance()->audio_mapping(_audio_channels), + _audio_channels, + bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), + false, + true + ) + ); - _butler.reset (new Butler (_player, _film->log(), map, _audio_channels)); 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 (); - } -} - -void -FilmViewer::refresh_panel () -{ - _panel->Refresh (); - _panel->Update (); + resume (); } void -FilmViewer::get () +FilmViewer::refresh_view () { - DCPOMATIC_ASSERT (_butler); - - do { - 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() && - (_eyes != _player_video.first->eyes()) - ); - - _butler->rethrow (); - - display_player_video (); + _state_timer.set ("update-view"); + _video_view->update (); + _state_timer.unset (); } void FilmViewer::display_player_video () { if (!_player_video.first) { - _frame.reset (); - refresh_panel (); + _video_view->set_image (shared_ptr()); + refresh_view (); return; } - if (_playing && (time() - _player_video.second) > one_video_frame()) { + if (_playing && !_suspended && (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). */ @@ -259,92 +268,34 @@ 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()); } -void -FilmViewer::timer () -{ - if (!_film || !_playing) { - return; - } - - get (); - PositionChanged (); - 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 (); - } -} - -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 @@ -355,11 +306,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 (); @@ -376,16 +324,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); } @@ -396,6 +344,28 @@ FilmViewer::calculate_sizes () _player->set_video_container_size (_out_size); } +void +FilmViewer::suspend () +{ + ++_suspended; + if (_audio.isStreamRunning()) { + _audio.abortStream(); + } +} + +void +FilmViewer::resume () +{ + --_suspended; + if (_playing && !_suspended) { + if (_audio.isStreamOpen()) { + _audio.setStreamTime (_video_position.seconds()); + _audio.startStream (); + } + timer (); + } +} + void FilmViewer::start () { @@ -403,6 +373,12 @@ FilmViewer::start () return; } + optional v = PlaybackPermitted (); + if (v && !*v) { + /* Computer says no */ + return; + } + if (_audio.isStreamOpen()) { _audio.setStreamTime (_video_position.seconds()); _audio.startStream (); @@ -410,8 +386,8 @@ FilmViewer::start () _playing = true; _dropped = 0; - timer (); - Started (); + _video_view->start (); + Started (position()); } bool @@ -427,25 +403,10 @@ FilmViewer::stop () } _playing = false; - Stopped (); + 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); - PositionChanged (); -} - void FilmViewer::player_change (ChangeType type, int property, bool frequent) { @@ -504,7 +465,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; } @@ -513,19 +474,11 @@ FilmViewer::quick_refresh () } void -FilmViewer::set_position (DCPTime p) -{ - _video_position = p; - seek (p, true); - PositionChanged (); -} - -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); } } @@ -549,20 +502,44 @@ FilmViewer::seek (DCPTime t, bool accurate) return; } - bool const was_running = stop (); + if (t < DCPTime ()) { + t = DCPTime (); + } + + if (t >= _film->length ()) { + t = _film->length (); + } + + suspend (); _closed_captions_dialog->clear (); _butler->seek (t, accurate); - get (); - if (was_running) { - start (); + if (!_playing) { + request_idle_get (); + } else { + /* Make sure we get a frame so that _video_position is set up before we resume */ + while (!get(true)) {} } + + resume (); } void FilmViewer::config_changed (Config::Property p) { +#ifdef DCPOMATIC_VARIANT_SWAROOP + if (p == Config::PLAYER_BACKGROUND_IMAGE) { + refresh_view (); + return; + } +#endif + + if (p == Config::AUDIO_MAPPING) { + recreate_butler (); + return; + } + if (p != Config::SOUND && p != Config::SOUND_OUTPUT) { return; } @@ -601,7 +578,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()) ); } @@ -691,9 +668,10 @@ FilmViewer::dcp_decode_reduction () const DCPTime FilmViewer::one_video_frame () const { - return DCPTime::from_frames (1, _film->video_frame_rate()); + return DCPTime::from_frames (1, _film ? _film->video_frame_rate() : 24); } +/** Open a dialog box showing our film's closed captions */ void FilmViewer::show_closed_captions () { @@ -701,11 +679,13 @@ FilmViewer::show_closed_captions () } void -FilmViewer::move (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; }