Still more decode logging.

[dcpomatic.git] / src / lib / video_decoder.cc

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index e3755e44f0b02881577b1eb83c3fe0819ee3b311..383af102d9965e230fa2595070e8086e47fc9061 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -37,17 +37,12 @@ using boost::shared_ptr;
 using boost::optional;
 
 VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c, shared_ptr<Log> log)
+       : DecoderPart (parent, log)
 #ifdef DCPOMATIC_DEBUG
-       : test_gaps (0)
-       , _parent (parent),
-         _content (c)
-#else
-        : _parent (parent)
-       , _content (c)
+       , test_gaps (0)
 #endif
-       , _log (log)
+       , _content (c)
        , _last_seek_accurate (true)
-       , _ignore (false)
 {
        _black_image.reset (new Image (AV_PIX_FMT_RGB24, _content->video->size(), true));
        _black_image->make_black ();
@@ -79,18 +74,16 @@ VideoDecoder::get (Frame frame, bool accurate)
                return list<ContentVideo> ();
        }
 
-       /* At this stage, if we have get_video()ed before, _decoded will contain the last frame that this
-          method returned (and possibly a few more).  If the requested frame is not in _decoded and it is not the next
-          one after the end of _decoded we need to seek.
-       */
-
        _log->log (String::compose ("VD has request for %1", frame), LogEntry::TYPE_DEBUG_DECODE);
 
        /* See if we have frame, and suggest a seek if not */
+
        list<ContentVideo>::const_iterator i = _decoded.begin ();
        while (i != _decoded.end() && i->frame.index() != frame) {
+               _log->log (String::compose ("VD has stored %1 which is no good", i->frame.index()), LogEntry::TYPE_DEBUG_DECODE);
                ++i;
        }
+
        if (i == _decoded.end()) {
                Frame seek_frame = frame;
                if (_content->video->frame_type() == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
@@ -99,7 +92,8 @@ VideoDecoder::get (Frame frame, bool accurate)
                        */
                        seek_frame *= 2;
                }
-               _parent->maybe_seek_video (ContentTime::from_frames (seek_frame, _content->active_video_frame_rate()), accurate);
+               _log->log (String::compose ("VD suggests seek to %1", seek_frame), LogEntry::TYPE_DEBUG_DECODE);
+               maybe_seek (ContentTime::from_frames (seek_frame, _content->active_video_frame_rate()), accurate);
        }
 
        /* Work out the number of frames that we should return; we
@@ -179,6 +173,7 @@ VideoDecoder::get (Frame frame, bool accurate)
           for 3D), but nothing before that
        */
        while (!_decoded.empty() && !dec.empty() && _decoded.front().frame.index() < dec.front().frame.index()) {
+               _log->log (String::compose ("VD discards %1", _decoded.front().frame.index()), LogEntry::TYPE_DEBUG_DECODE);
                _decoded.pop_front ();
        }
 
@@ -274,7 +269,7 @@ VideoDecoder::fill_both_eyes (VideoFrame from, VideoFrame to)
 void
 VideoDecoder::give (shared_ptr<const ImageProxy> image, Frame frame)
 {
-       if (_ignore) {
+       if (ignore ()) {
                return;
        }
 
@@ -390,14 +385,8 @@ VideoDecoder::give (shared_ptr<const ImageProxy> image, Frame frame)
 void
 VideoDecoder::seek (ContentTime s, bool accurate)
 {
+       _log->log (String::compose ("VD seek to %1", to_string(s)), LogEntry::TYPE_DEBUG_DECODE);
        _decoded.clear ();
        _last_seek_time = s;
        _last_seek_accurate = accurate;
 }
-
-/** Set this decoder never to produce any data */
-void
-VideoDecoder::set_ignore ()
-{
-       _ignore = true;
-}