X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fshuffler.cc;h=0e478a562a658a6e6fe48493772ddb1eced6ee1f;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=59656317d3e19a717b237a624d067d831bc6f3ae;hpb=6e6ebf3122333b38333482bce64df3e6e61e64c4;p=dcpomatic.git

diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc
index 59656317d..0e478a562 100644
--- 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-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,14 +21,18 @@
 #include "shuffler.h"
 #include "content_video.h"
 #include "dcpomatic_assert.h"
-#include <boost/foreach.hpp>
+#include "dcpomatic_log.h"
+#include <string>
 #include <iostream>
 
 using std::make_pair;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::string;
+using std::weak_ptr;
+using std::shared_ptr;
 using boost::optional;
 
+int const Shuffler::_max_size = 64;
+
 struct Comparator
 {
 	bool operator()(Shuffler::Store const & a, Shuffler::Store const & b) {
@@ -42,13 +46,19 @@ 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);
+	LOG_DEBUG_THREED ("Shuffler::video frame=%1 eyes=%2 part=%3", video.frame, static_cast<int>(video.eyes), static_cast<int>(video.part));
+
+	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);
 
 	if (!_last && video.eyes == EYES_LEFT) {
+		LOG_DEBUG_THREED_NC ("Shuffler first after clear");
 		/* We haven't seen anything since the last clear() and we have some eyes-left so assume everything is OK */
 		Video (weak_piece, video);
 		_last = video;
@@ -64,11 +74,17 @@ 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) {
+			string const store = _store.empty() ? "store empty" : String::compose("store front frame=%1 eyes=%2", _store.front().second.frame, static_cast<int>(_store.front().second.eyes));
+			string const last = _last ? String::compose("last frame=%1 eyes=%2", _last->frame, static_cast<int>(_last->eyes)) : "no last";
+			LOG_DEBUG_THREED("Shuffler not in sequence: %1 %2", store, last);
+		}
+
+		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 +92,11 @@ 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);
+		}
+
+		LOG_DEBUG_THREED("Shuffler emits frame=%1 eyes=%2 store=%3", _store.front().second.frame, static_cast<int>(_store.front().second.eyes), _store.size());
 		Video (_store.front().first, _store.front().second);
 		_last = _store.front().second;
 		_store.pop_front ();
@@ -85,6 +106,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 void
 Shuffler::clear ()
 {
+	LOG_DEBUG_THREED_NC ("Shuffler::clear");
 	_store.clear ();
 	_last = optional<ContentVideo>();
 }
@@ -92,7 +114,7 @@ Shuffler::clear ()
 void
 Shuffler::flush ()
 {
-	BOOST_FOREACH (Store i, _store) {
+	for (auto i: _store) {
 		Video (i.first, i.second);
 	}
 }