X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_encoder_test.cc;h=1acfa96df773c4d7c1830033d6543691fc1d429f;hp=877e39d49169c6bd91a1a699234ec51e83c910ad;hb=54af50c3b8e9082f9751e809d63540c51197a4a1;hpb=4d11fe7cea71b0564df9a21a3cc706509d12b0d1

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 877e39d49..1acfa96df 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -45,7 +45,7 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f
 	string name = "ffmpeg_encoder_";
 	string extension;
 	switch (format) {
-	case EXPORT_FORMAT_H264:
+	case EXPORT_FORMAT_H264_AAC:
 		name += "h264";
 		extension = "mp4";
 		break;
@@ -180,7 +180,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7)
 /** Red / green / blue MP4 -> H264 */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test1)
 {
-	ffmpeg_content_test(1, "test/data/test.mp4", EXPORT_FORMAT_H264);
+	ffmpeg_content_test(1, "test/data/test.mp4", EXPORT_FORMAT_H264_AAC);
 }
 
 /** Just subtitles -> H264 */
@@ -200,7 +200,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, false, false, 23
+	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
@@ -229,7 +229,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, false, false, 23
+	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
@@ -247,7 +247,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, false, false, 23
+	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
@@ -305,7 +305,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, true, false, 23
+	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
@@ -337,10 +337,42 @@ 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, true, false, 23
+	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
 		);
 	encoder.go ();
 }
+
+/** Test export of a 3D DCP in a 2D project */
+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(private_data / "bbc405.png")));
+	film->examine_and_add_content (L);
+	shared_ptr<Content> R (shared_ptr<ImageContent>(new ImageContent(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);
+	L->set_position (film, DCPTime());
+	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
+	R->set_position (film, DCPTime());
+	film->set_three_d (true);
+	film->make_dcp ();
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	shared_ptr<Film> film2 = new_test_film2 ("ffmpeg_encoder_h264_test7_export");
+	shared_ptr<Content> dcp (new DCPContent(film->dir(film->dcp_name())));
+	film2->examine_and_add_content (dcp);
+	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
+		);
+	encoder.go ();
+}
+