Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x

2 files changed, 141 insertions, 0 deletions

diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
new file mode 100644
index 000000000..64d35a2eb
--- /dev/null
+++ b/test/dcp_decoder_test.cc
@@ -0,0 +1,140 @@
+/*
+    Copyright (C) 2019 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/>.
+
+*/
+
+/** @file  test/dcp_decoder_test.cc
+ *  @brief Test DCPDecoder class.
+ *  @ingroup selfcontained
+ */
+
+#include "lib/film.h"
+#include "lib/dcp_content.h"
+#include "lib/dcp_decoder.h"
+#include "lib/content_factory.h"
+#include "lib/player.h"
+#include "lib/examine_content_job.h"
+#include "lib/job_manager.h"
+#include "lib/config.h"
+#include "test.h"
+#include <dcp/dcp.h>
+#include <boost/test/unit_test.hpp>
+#include <iostream>
+
+using std::list;
+using std::string;
+using std::vector;
+using boost::shared_ptr;
+
+/* Check that DCPDecoder reuses old data when it should */
+BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
+{
+	/* Make some DCPs */
+
+	shared_ptr<Film> ov = new_test_film2 ("check_reuse_old_data_ov");
+	ov->examine_and_add_content (content_factory("test/data/flat_red.png").front());
+	BOOST_REQUIRE (!wait_for_jobs());
+	ov->make_dcp ();
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	shared_ptr<Film> vf = new_test_film2 ("check_reuse_old_data_vf");
+	shared_ptr<DCPContent> ov_content(new DCPContent(ov->dir(ov->dcp_name(false))));
+	vf->examine_and_add_content (ov_content);
+	vf->examine_and_add_content (content_factory("test/data/L.wav").front());
+	BOOST_REQUIRE (!wait_for_jobs());
+	ov_content->set_reference_video (true);
+	vf->make_dcp ();
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	shared_ptr<Film> encrypted = new_test_film2 ("check_reuse_old_data_decrypted");
+	encrypted->examine_and_add_content (content_factory("test/data/flat_red.png").front());
+	BOOST_REQUIRE (!wait_for_jobs());
+	encrypted->set_encrypted (true);
+	encrypted->make_dcp ();
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	dcp::DCP encrypted_dcp (encrypted->dir(encrypted->dcp_name()));
+	encrypted_dcp.read ();
+
+	dcp::EncryptedKDM kdm = encrypted->make_kdm (
+		Config::instance()->decryption_chain()->leaf(),
+		vector<string>(),
+		encrypted_dcp.cpls().front()->file().get(),
+		dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
+		dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
+		dcp::MODIFIED_TRANSITIONAL_1,
+		true, 0
+		);
+
+
+	/* Add just the OV to a new project, move it around a bit and check that
+	   the _reels get reused.
+	*/
+	shared_ptr<Film> test = new_test_film2 ("check_reuse_old_data_test1");
+	ov_content.reset (new DCPContent(ov->dir(ov->dcp_name(false))));
+	test->examine_and_add_content (ov_content);
+	BOOST_REQUIRE (!wait_for_jobs());
+	shared_ptr<Player> player (new Player(test, test->playlist()));
+
+	shared_ptr<DCPDecoder> decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	BOOST_REQUIRE (decoder);
+	list<shared_ptr<dcp::Reel> > reels = decoder->reels();
+
+	ov_content->set_position (test, dcpomatic::DCPTime(96000));
+	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	BOOST_REQUIRE (decoder);
+	BOOST_REQUIRE (reels == decoder->reels());
+
+	/* Add the VF to a new project, then add the OV and check that the
+	   _reels did not get reused.
+	*/
+	test = new_test_film2 ("check_reuse_old_data_test2");
+	shared_ptr<DCPContent> vf_content (new DCPContent(vf->dir(vf->dcp_name(false))));
+	test->examine_and_add_content (vf_content);
+	BOOST_REQUIRE (!wait_for_jobs());
+	player.reset (new Player(test, test->playlist()));
+
+	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	BOOST_REQUIRE (decoder);
+	reels = decoder->reels();
+
+	vf_content->add_ov (ov->dir(ov->dcp_name(false)));
+	JobManager::instance()->add (shared_ptr<Job>(new ExamineContentJob(test, vf_content)));
+	BOOST_REQUIRE (!wait_for_jobs());
+	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	BOOST_REQUIRE (decoder);
+	BOOST_REQUIRE (reels != decoder->reels());
+
+	/* Add a KDM to an encrypted DCP and check that the _reels did not get reused */
+	test = new_test_film2 ("check_reuse_old_data_test3");
+	shared_ptr<DCPContent> encrypted_content (new DCPContent(encrypted->dir(encrypted->dcp_name(false))));
+	test->examine_and_add_content (encrypted_content);
+	BOOST_REQUIRE (!wait_for_jobs());
+	player.reset (new Player(test, test->playlist()));
+
+	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	BOOST_REQUIRE (decoder);
+	reels = decoder->reels();
+
+	encrypted_content->add_kdm (kdm);
+	JobManager::instance()->add (shared_ptr<Job>(new ExamineContentJob(test, encrypted_content)));
+	BOOST_REQUIRE (!wait_for_jobs());
+	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
+	BOOST_REQUIRE (decoder);
+	BOOST_REQUIRE (reels != decoder->reels());
+}
diff --git a/test/wscript b/test/wscript
index 1d2fafc02..3c6170dcf 100644
--- a/test/wscript
+++ b/test/wscript
@@ -61,6 +61,7 @@ def build(bld):
                  create_cli_test.cc
                  crypto_test.cc
                  dcpomatic_time_test.cc
+                 dcp_decoder_test.cc
                  dcp_playback_test.cc
                  dcp_subtitle_test.cc
                  digest_test.cc