Guess video range better when importing 2.14.x projects (#2227).

2 files changed, 36 insertions, 0 deletions

diff --git a/test/data b/test/data
-Subproject 796f3e657f63985b360447a437c1d30be1ccaa2
+Subproject 6b3ced6ff12cca13b1765c16bbdface28040e44
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 62cb5cf1d..5c44c2a91 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -32,6 +32,7 @@
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/text_content.h"
+#include "lib/video_content.h"
 #include "test.h"
 #include <boost/date_time.hpp>
 #include <boost/filesystem.hpp>
@@ -174,3 +175,38 @@ BOOST_AUTO_TEST_CASE (metadata_loads_from_2_14_x_4)
 	BOOST_REQUIRE (!film->luminance());
 }
 
+
+BOOST_AUTO_TEST_CASE (metadata_video_range_guessed_for_dcp)
+{
+	namespace fs = boost::filesystem;
+	auto film = make_shared<Film>(fs::path("test/data/214x_dcp"));
+	film->read_metadata();
+
+	BOOST_REQUIRE_EQUAL(film->content().size(), 1U);
+	BOOST_REQUIRE(film->content()[0]->video);
+	BOOST_CHECK(film->content()[0]->video->range() == VideoRange::FULL);
+}
+
+
+BOOST_AUTO_TEST_CASE (metadata_video_range_guessed_for_mp4_with_unknown_range)
+{
+	namespace fs = boost::filesystem;
+	auto film = make_shared<Film>(fs::path("test/data/214x_mp4"));
+	film->read_metadata();
+
+	BOOST_REQUIRE_EQUAL(film->content().size(), 1U);
+	BOOST_REQUIRE(film->content()[0]->video);
+	BOOST_CHECK(film->content()[0]->video->range() == VideoRange::VIDEO);
+}
+
+
+BOOST_AUTO_TEST_CASE (metadata_video_range_guessed_for_png)
+{
+	namespace fs = boost::filesystem;
+	auto film = make_shared<Film>(fs::path("test/data/214x_png"));
+	film->read_metadata();
+
+	BOOST_REQUIRE_EQUAL(film->content().size(), 1U);
+	BOOST_REQUIRE(film->content()[0]->video);
+	BOOST_CHECK(film->content()[0]->video->range() == VideoRange::FULL);
+}