X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=a2e116f9a7aa1802d396cfe05665e0b9665107e1;hb=cc279961a2a9ffea67ed21378fef44c2e1bcb202;hp=b4599cf809fe1914625a0ac3de959920596ed4ba;hpb=b7a57184200d340bebcf81552aa1f05f220a8ec5;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index b4599cf80..a2e116f9a 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -29,6 +29,7 @@
 #include "lib/config.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
+#include "lib/dcp_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/film.h"
@@ -41,6 +42,8 @@
 #include "lib/util.h"
 #include "lib/video_content.h"
 #include "test.h"
+#include <dcp/mono_picture_asset.h>
+#include <dcp/stereo_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -93,7 +96,7 @@ BOOST_AUTO_TEST_CASE (threed_test2)
  */
 BOOST_AUTO_TEST_CASE (threed_test3)
 {
-	shared_ptr<Film> film = new_test_film2 ("threed_test3");
+	auto film = new_test_film2 ("threed_test3");
 	auto L = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/test.mp4");
@@ -183,7 +186,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 
 	auto film = new_test_film2 ("threed_test7");
 	path const content_path = "test/data/flat_red.png";
-	auto c = content_factory(content_path).front();
+	auto c = content_factory(content_path)[0];
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -224,7 +227,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
  */
 BOOST_AUTO_TEST_CASE (threed_test_separate_files_slightly_different_lengths)
 {
-	shared_ptr<Film> film = new_test_film2 ("threed_test3");
+	auto film = new_test_film2("threed_test3");
 	auto L = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/test.mp4");
@@ -245,7 +248,7 @@ BOOST_AUTO_TEST_CASE (threed_test_separate_files_slightly_different_lengths)
  */
 BOOST_AUTO_TEST_CASE (threed_test_separate_files_very_different_lengths)
 {
-	shared_ptr<Film> film = new_test_film2 ("threed_test3");
+	auto film = new_test_film2("threed_test3");
 	auto L = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/test.mp4");
@@ -270,9 +273,11 @@ BOOST_AUTO_TEST_CASE (threed_test_butler_overfill)
 	film->examine_and_add_content(B);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	auto player = std::make_shared<Player>(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT);
 	int const audio_channels = 2;
-	auto butler = std::make_shared<Butler>(film, player, AudioMapping(), audio_channels, boost::bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false);
+	auto butler = std::make_shared<Butler>(
+		film, player, AudioMapping(), audio_channels, boost::bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED
+		);
 
 	int const audio_frames = 1920;
 	std::vector<float> audio(audio_frames * audio_channels);
@@ -289,3 +294,48 @@ BOOST_AUTO_TEST_CASE (threed_test_butler_overfill)
 	BOOST_REQUIRE (error.code == Butler::Error::Code::NONE);
 }
 
+
+/** Check that creating a 2D DCP from a 3D DCP passes the J2K data unaltered */
+BOOST_AUTO_TEST_CASE(threed_passthrough_test, * boost::unit_test::depends_on("threed_test6"))
+{
+	using namespace boost::filesystem;
+
+	/* Find the DCP in threed_test6 */
+	boost::optional<path> input_dcp;
+	for (auto i: directory_iterator("build/test/threed_test6")) {
+		if (is_directory(i.path()) && boost::algorithm::starts_with(i.path().filename().string(), "Dcp")) {
+			input_dcp = i.path();
+		}
+	}
+
+	BOOST_REQUIRE(input_dcp);
+
+	auto content = make_shared<DCPContent>(*input_dcp);
+	auto film = new_test_film2("threed_passthrough_test", { content });
+	film->set_three_d(false);
+
+	make_and_verify_dcp(film);
+
+	std::vector<directory_entry> matches;
+	std::copy_if(recursive_directory_iterator(*input_dcp), recursive_directory_iterator(), std::back_inserter(matches), [](directory_entry const& entry) {
+		return boost::algorithm::starts_with(entry.path().leaf().string(), "j2c");
+	});
+
+	BOOST_REQUIRE_EQUAL(matches.size(), 1U);
+
+	auto stereo = dcp::StereoPictureAsset(matches[0]);
+	auto stereo_reader = stereo.start_read();
+
+	auto mono = dcp::MonoPictureAsset(dcp_file(film, "j2c"));
+	auto mono_reader = mono.start_read();
+
+	BOOST_REQUIRE_EQUAL(stereo.intrinsic_duration(), mono.intrinsic_duration());
+
+	for (auto i = 0; i < stereo.intrinsic_duration(); ++i) {
+		auto stereo_frame = stereo_reader->get_frame(i);
+		auto mono_frame = mono_reader->get_frame(i);
+		BOOST_REQUIRE(stereo_frame->left()->size() == mono_frame->size());
+		BOOST_REQUIRE_EQUAL(memcmp(stereo_frame->left()->data(), mono_frame->data(), mono_frame->size()), 0);
+	}
+}
+