More player debugging for butler video-full states.

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

diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc
index 59656317d3e19a717b237a624d067d831bc6f3ae..a46b26da0f85ee652fdd83f6e18fa1f1f7382e10 100644 (file)
--- a/src/lib/shuffler.cc
+++ b/src/lib/shuffler.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,6 +21,7 @@
 #include "shuffler.h"
 #include "content_video.h"
 #include "dcpomatic_assert.h"
+#include "dcpomatic_log.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -29,6 +30,8 @@ using boost::weak_ptr;
 using boost::shared_ptr;
 using boost::optional;
 
+int const Shuffler::_max_size = 64;
+
 struct Comparator
 {
        bool operator()(Shuffler::Store const & a, Shuffler::Store const & b) {
@@ -42,8 +45,11 @@ struct Comparator
 void
 Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 {
-       /* We should only ever see 3D_LEFT / 3D_RIGHT */
-       DCPOMATIC_ASSERT (video.eyes == EYES_LEFT || video.eyes == EYES_RIGHT);
+       if (video.eyes != EYES_LEFT && video.eyes != EYES_RIGHT) {
+               /* Pass through anything that we don't care about */
+               Video (weak_piece, video);
+               return;
+       }
 
        shared_ptr<Piece> piece = weak_piece.lock ();
        DCPOMATIC_ASSERT (piece);
@@ -64,11 +70,11 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
                        !_store.empty() &&
                        _last &&
                        (
-                               (_store.front().second.frame == _last->frame && _store.front().second.eyes == EYES_RIGHT && _last->eyes == EYES_LEFT) ||
-                               (_store.front().second.frame == (_last->frame + 1) && _store.front().second.eyes == EYES_LEFT && _last->eyes == EYES_RIGHT)
+                               (_store.front().second.frame == _last->frame       && _store.front().second.eyes == EYES_RIGHT && _last->eyes == EYES_LEFT) ||
+                               (_store.front().second.frame >= (_last->frame + 1) && _store.front().second.eyes == EYES_LEFT  && _last->eyes == EYES_RIGHT)
                                );
 
-               if (!store_front_in_sequence && _store.size() <= 8) {
+               if (!store_front_in_sequence && _store.size() <= _max_size) {
                        /* store_front_in_sequence means everything is ok; otherwise if the store is getting too big just
                           start emitting things as best we can.  This can easily happen if, for example, there is only content
                           for one eye in some part of the timeline.
@@ -76,6 +82,10 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
                        break;
                }
 
+               if (_store.size() > _max_size) {
+                       LOG_WARNING ("Shuffler is full after receiving frame %1; 3D sync may be incorrect.", video.frame);
+               }
+
                Video (_store.front().first, _store.front().second);
                _last = _store.front().second;
                _store.pop_front ();