Handle fonts for ccaps coming from DCP content (#2525).

[dcpomatic.git] / test / ffmpeg_encoder_test.cc

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 0881d2e2e1007b40dad31c069c64724231586d2b..8483330fd188a1d9887c74dacc73061053a21a89 100644 (file)
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -40,9 +40,8 @@
 #include <boost/test/unit_test.hpp>
 
 
-using std::string;
-using std::shared_ptr;
 using std::make_shared;
+using std::string;
 using namespace dcpomatic;
 
 
@@ -370,6 +369,18 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
 }
 
 
+BOOST_AUTO_TEST_CASE(ffmpeg_encoder_2d_content_in_3d_project)
+{
+       auto content = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
+       auto film = new_test_film2("ffmpeg_encoder_2d_content_in_3d_project", { content });
+       film->set_three_d(true);
+
+       auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
+       FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_2d_content_in_3d_project.mp4", ExportFormat::H264_AAC, true, false, false, 23);
+       encoder.go();
+}
+
+
 /** Stereo project with mixdown-to-stereo set */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
 {
@@ -387,9 +398,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
 /** 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");
        auto c = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
+       auto film = new_test_film2("ffmpeg_encoder_prores_test9", { c });
+       film->set_name ("ffmpeg_encoder_prores_test9");
        film->set_container (Ratio::from_id ("185"));
        film->set_audio_channels (12);
 
@@ -464,18 +475,25 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_with_reels)
 /** Regression test for "Error during decoding: Butler finished" (#2097) */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_1)
 {
+       Cleanup cl;
+
        auto content = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv")[0];
        auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_1", { content });
 
        auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
        FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_1.mov", ExportFormat::PRORES_HQ, false, true, false, 23);
        encoder.go ();
+
+       cl.add("build/test/ffmpeg_encoder_prores_regression_1.mov");
+       cl.run();
 }
 
 
 /** Regression test for Butler video buffers reached 480 frames (audio is 0) (#2101) */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
 {
+       Cleanup cl;
+
        auto logs = dcpomatic_log->types();
        dcpomatic_log->set_types(logs | LogEntry::TYPE_DEBUG_PLAYER);
 
@@ -487,5 +505,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
        encoder.go ();
 
        dcpomatic_log->set_types(logs);
+
+       cl.add("build/test/ffmpeg_encoder_prores_regression_2.mov");
+       cl.run();
 }