More player debugging for butler video-full states.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index ccff35092929732a59da052a9744c782ecdf086b..0e47ac1acb47947da199f71430e03d2657c70e07 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -44,6 +44,7 @@
 #include "lib/log.h"
 #include "lib/config.h"
 #include "lib/compose.hpp"
+#include "lib/dcpomatic_log.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -86,8 +87,10 @@ FilmViewer::FilmViewer (wxWindow* p)
        , _closed_captions_dialog (new ClosedCaptionsDialog(p))
        , _outline_content (false)
        , _eyes (EYES_LEFT)
+       , _pad_black (false)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        , _in_watermark (false)
+       , _background_image (false)
 #endif
 {
 #ifndef __WXOSX__
@@ -120,8 +123,9 @@ FilmViewer::set_film (shared_ptr<Film> film)
        }
 
        _film = film;
-
-       FilmChanged ();
+       _video_position = DCPTime ();
+       _player_video.first.reset ();
+       _player_video.second = DCPTime ();
 
        _frame.reset ();
        _closed_captions_dialog->clear ();
@@ -140,7 +144,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
                if (_dcp_decode_reduction) {
                        _player->set_dcp_decode_reduction (_dcp_decode_reduction);
                }
-       } catch (bad_alloc) {
+       } catch (bad_alloc &) {
                error_dialog (_panel, _("There is not enough free memory to do that."));
                _film.reset ();
                return;
@@ -192,7 +196,7 @@ 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 ();
        }
@@ -226,7 +230,8 @@ FilmViewer::get ()
        } 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 ();
@@ -266,15 +271,11 @@ 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 (
-               optional<dcp::NoteHandler>(bind(&Log::dcp_log, _film->log().get(), _1, _2)),
-               bind (&PlayerVideo::always_rgb, _1),
-               false, true
-               );
+       _frame = _player_video.first->image (bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true);
 
        ImageChanged (_player_video.first);
 
@@ -300,8 +301,11 @@ FilmViewer::timer ()
 
        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) {
@@ -309,21 +313,42 @@ FilmViewer::timer ()
        }
 }
 
+bool
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
+{
+       optional<boost::filesystem::path> 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;
+       }
+
+       return false;
+}
+#else
+FilmViewer::maybe_draw_background_image (wxPaintDC &)
+{
+       return false;
+}
+#endif
+
 void
 FilmViewer::paint_panel ()
 {
        wxPaintDC dc (_panel);
 
-       if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) {
-               dc.Clear ();
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-               optional<boost::filesystem::path> 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));
-               }
+       if (_background_image) {
+               dc.Clear ();
+               maybe_draw_background_image (dc);
+               return;
+       }
 #endif
+
+       if (!_out_size.width || !_out_size.height || !_film || !_frame || _out_size != _frame->size()) {
+               dc.Clear ();
                return;
        }
 
@@ -354,16 +379,16 @@ FilmViewer::paint_panel ()
 
        if (_out_size.width < _panel_size.width) {
                /* XXX: these colours are right for GNOME; may need adjusting for other OS */
-               wxPen p (wxColour (240, 240, 240));
-               wxBrush b (wxColour (240, 240, 240));
+               wxPen   p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+               wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
                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 (wxColour (240, 240, 240));
-               wxBrush b (wxColour (240, 240, 240));
+               wxPen   p (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+               wxBrush b (_pad_black ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
                dc.SetPen (p);
                dc.SetBrush (b);
                int const gap = (_panel_size.height - _out_size.height) / 2;
@@ -534,7 +559,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;
        }
 
@@ -590,7 +615,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
        }
 
        PositionChanged ();
-       Seeked (position());
 }
 
 void
@@ -746,3 +770,9 @@ FilmViewer::seek_by (DCPTime by, bool accurate)
 {
        seek (_video_position + by, accurate);
 }
+
+void
+FilmViewer::set_pad_black (bool p)
+{
+       _pad_black = p;
+}