X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffilm_metadata_test.cc;h=878e6025422208c851e530953c41dc090d7b1925;hb=a9b1c1cb65e1902a64430977cf698054e131a6f4;hp=62cb5cf1d562f47a95868b70a3416cba03bb9e5b;hpb=7981ff2fe80ec88954e0f3eb4ff3c6e634c872f6;p=dcpomatic.git

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 62cb5cf1d..878e60254 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>
@@ -62,6 +63,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	film->set_distributor (string(""));
 	film->set_facility (string(""));
 	film->set_release_territory (dcp::LanguageTag::RegionSubtag("US"));
+	film->set_audio_channels(6);
 	film->write_metadata ();
 
 	list<string> ignore = { "Key", "ContextID", "LastWrittenBy" };
@@ -82,8 +84,8 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 /** Check a bug where <Content> tags with multiple <Text>s would fail to load */
 BOOST_AUTO_TEST_CASE (multiple_text_nodes_are_allowed)
 {
-	auto subs = content_factory("test/data/15s.srt").front();
-	auto caps = content_factory("test/data/15s.srt").front();
+	auto subs = content_factory("test/data/15s.srt")[0];
+	auto caps = content_factory("test/data/15s.srt")[0];
 	auto film = new_test_film2("multiple_text_nodes_are_allowed1", { subs, caps });
 	caps->only_text()->set_type(TextType::CLOSED_CAPTION);
 	make_and_verify_dcp (
@@ -174,3 +176,59 @@ 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);
+}
+
+
+/* Bug #2581 */
+BOOST_AUTO_TEST_CASE(effect_node_not_inserted_incorrectly)
+{
+	auto sub = content_factory("test/data/15s.srt");
+	auto film = new_test_film2("effect_node_not_inserted_incorrectly", sub);
+	film->write_metadata();
+
+	namespace fs = boost::filesystem;
+	auto film2 = make_shared<Film>(fs::path("build/test/effect_node_not_inserted_incorrectly"));
+	film2->read_metadata();
+	film2->write_metadata();
+
+	cxml::Document doc("Metadata");
+	doc.read_file("build/test/effect_node_not_inserted_incorrectly/metadata.xml");
+
+	/* There should be no <Effect> node in the text, since we don't want to force the effect to "none" */
+	BOOST_CHECK(!doc.node_child("Playlist")->node_child("Content")->node_child("Text")->optional_node_child("Effect"));
+}
+