X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_encoder_test.cc;h=505bca7662f79f9e8fa7efdc3929e95f993fcbb4;hb=bd7f4bbde17d2087ba4c4bddf6439b3df869b1db;hp=d80bfb2e0067dd79d620ea8b0994710606aab6f2;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index d80bfb2e0..505bca766 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -71,11 +71,7 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f
 
 	film->write_metadata ();
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, String::compose("build/test/%1.%2", name, extension), format, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, String::compose("build/test/%1.%2", name, extension), format, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -88,19 +84,19 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test1)
 /** Dolby Aurora trailer VOB -> Prores */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test2)
 {
-	ffmpeg_content_test (2, TestPaths::private_data / "dolby_aurora.vob", EXPORT_FORMAT_PRORES);
+	ffmpeg_content_test (2, TestPaths::private_data() / "dolby_aurora.vob", EXPORT_FORMAT_PRORES);
 }
 
 /** Sintel trailer -> Prores */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test3)
 {
-	ffmpeg_content_test (3, TestPaths::private_data / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", EXPORT_FORMAT_PRORES);
+	ffmpeg_content_test (3, TestPaths::private_data() / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", EXPORT_FORMAT_PRORES);
 }
 
 /** Big Buck Bunny trailer -> Prores */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test4)
 {
-	ffmpeg_content_test (4, TestPaths::private_data / "big_buck_bunny_trailer_480p.mov", EXPORT_FORMAT_PRORES);
+	ffmpeg_content_test (4, TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov", EXPORT_FORMAT_PRORES);
 }
 
 /** Still image -> Prores */
@@ -108,7 +104,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5)
 {
 	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_prores_test5");
 	film->set_name ("ffmpeg_encoder_prores_test5");
-	shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data / "bbc405.png"));
+	shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data() / "bbc405.png"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
 
@@ -119,11 +115,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5)
 
 	film->write_metadata ();
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", EXPORT_FORMAT_PRORES, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", EXPORT_FORMAT_PRORES, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -144,11 +136,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6)
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", EXPORT_FORMAT_PRORES, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-					 );
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", EXPORT_FORMAT_PRORES, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -172,11 +160,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7)
 	s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255));
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", EXPORT_FORMAT_PRORES, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", EXPORT_FORMAT_PRORES, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -203,11 +187,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2)
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", EXPORT_FORMAT_H264_AAC, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", EXPORT_FORMAT_H264_AAC, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -232,11 +212,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3)
 	film->write_metadata();
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", EXPORT_FORMAT_H264_AAC, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", EXPORT_FORMAT_H264_AAC, false, false, false, 23);
 	encoder.go ();
 }
 
@@ -250,11 +226,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test4)
 	film->set_container(Ratio::from_id("185"));
 
 	shared_ptr<Job> job(new TranscodeJob(film));
-	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", EXPORT_FORMAT_H264_AAC, false, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", EXPORT_FORMAT_H264_AAC, false, false, false, 23);
 	encoder.go();
 }
 
@@ -308,11 +280,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
 	Rs->audio->set_mapping (map);
 
 	shared_ptr<Job> job (new TranscodeJob (film));
-	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", EXPORT_FORMAT_H264_AAC, true, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23);
 	encoder.go ();
 
 	check_ffmpeg ("build/test/ffmpeg_encoder_h264_test5.mp4", "test/data/ffmpeg_encoder_h264_test5.mp4", 1);
@@ -322,7 +290,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
 {
 	shared_ptr<Film> film = new_test_film2 ("ffmpeg_encoder_h264_test6_ov");
-	film->examine_and_add_content (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data / "bbc405.png")));
+	film->examine_and_add_content (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data() / "bbc405.png")));
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -340,11 +308,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
 	}
 
 	shared_ptr<Job> job (new TranscodeJob (film2));
-	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", EXPORT_FORMAT_H264_AAC, true, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23);
 	encoder.go ();
 }
 
@@ -352,9 +316,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
 {
 	shared_ptr<Film> film = new_test_film2 ("ffmpeg_encoder_h264_test7_data");
-	shared_ptr<Content> L (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data / "bbc405.png")));
+	shared_ptr<Content> L (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data() / "bbc405.png")));
 	film->examine_and_add_content (L);
-	shared_ptr<Content> R (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data / "bbc405.png")));
+	shared_ptr<Content> R (shared_ptr<ImageContent>(new ImageContent(TestPaths::private_data() / "bbc405.png")));
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
@@ -371,11 +335,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	shared_ptr<Job> job (new TranscodeJob (film2));
-	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test7.mp4", EXPORT_FORMAT_H264_AAC, true, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test7.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23);
 	encoder.go ();
 }
 
@@ -389,10 +349,27 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
 	film->set_audio_channels (2);
 
 	shared_ptr<Job> job(new TranscodeJob(film));
-	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test8.mp4", EXPORT_FORMAT_H264_AAC, true, false, 23
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-			       , optional<dcp::Key>(), optional<string>()
-#endif
-		);
+	FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test8.mp4", EXPORT_FORMAT_H264_AAC, true, false, false, 23);
 	encoder.go();
 }
+
+
+/** 7.1/HI/VI (i.e. 12-channel) project */
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
+{
+	shared_ptr<Film> film = new_test_film ("ffmpeg_encoder_prores_test9");
+	film->set_name ("ffmpeg_encoder_prores_test9");
+	shared_ptr<ImageContent> c (new ImageContent(TestPaths::private_data() / "bbc405.png"));
+	film->set_container (Ratio::from_id ("185"));
+	film->set_audio_channels (12);
+
+	film->examine_and_add_content (c);
+	BOOST_REQUIRE (!wait_for_jobs ());
+
+	c->video->set_length (240);
+
+	film->write_metadata ();
+	shared_ptr<Job> job (new TranscodeJob (film));
+	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test9.mov", EXPORT_FORMAT_H264_AAC, false, false, false, 23);
+	encoder.go ();
+}