Nicer fix for 2D-labelled-3D checking from master.

2 files changed, 141 insertions, 0 deletions

diff --git a/test/frame_interval_checker_test.cc b/test/frame_interval_checker_test.cc
new file mode 100644
index 000000000..4b92d33d6
--- /dev/null
+++ b/test/frame_interval_checker_test.cc
@@ -0,0 +1,140 @@
+/*
+    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "lib/frame_interval_checker.h"
+#include <boost/test/unit_test.hpp>
+
+using namespace dcpomatic;
+
+/** Test of 2D-ish frame timings */
+BOOST_AUTO_TEST_CASE (frame_interval_checker_test1)
+{
+	FrameIntervalChecker checker;
+	ContentTime t(3888);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4012);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4000);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4000);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(3776);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(3779);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4010);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4085);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4085);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4012);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4000);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4000);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(3776);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(3779);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4010);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4085);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4085);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::PROBABLY_NOT_3D);
+}
+
+/** Test of 3D-ish frame timings */
+BOOST_AUTO_TEST_CASE (frame_interval_checker_test2)
+{
+	FrameIntervalChecker checker;
+	ContentTime t(3888);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(0);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4000);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(0);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(3776);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(50);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4010);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(2);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4011);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(0);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4000);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(0);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(3776);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(50);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4010);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(2);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::AGAIN);
+	t += ContentTime(4011);
+	checker.feed (t, 24);
+	BOOST_CHECK (checker.guess() == FrameIntervalChecker::PROBABLY_3D);
+}
+
+
diff --git a/test/wscript b/test/wscript
index 3c6170dcf..0e777c803 100644
--- a/test/wscript
+++ b/test/wscript
@@ -79,6 +79,7 @@ def build(bld):
                  file_log_test.cc
                  file_naming_test.cc
                  film_metadata_test.cc
+                 frame_interval_checker_test.cc
                  frame_rate_test.cc
                  image_content_fade_test.cc
                  image_filename_sorter_test.cc