C++11 tidying.

[dcpomatic.git] / test / ffmpeg_encoder_test.cc

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 9bce836c3fb4d3c814912ddedc9c888683b256fd..c15973faed4ae9ef5b437da39fd825007bbdcd37 100644 (file)
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -333,7 +333,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
 /** Test export of a 3D DCP in a 2D project */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_3d_dcp_to_h264)
 {
-       auto dcp = make_shared<DCPContent>(TestPaths::private_data() / "XMenDarkPhoenix_TLR-12-3D_F_DE-XX_DE_51_2K_TCFG_20190227_TM_IOP-3D_OV");
+       auto dcp = make_shared<DCPContent>(TestPaths::private_data() / "xm");
        auto film2 = new_test_film2 ("ffmpeg_encoder_3d_dcp_to_h264_export", {dcp});
 
        auto job = make_shared<TranscodeJob> (film2);
@@ -397,3 +397,33 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
        FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test9.mov", ExportFormat::H264_AAC, false, false, false, 23);
        encoder.go ();
 }
+
+
+/** DCP -> Prores with crop */
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_from_dcp_with_crop)
+{
+       auto dcp = make_shared<DCPContent>("test/data/import_dcp_test2");
+       auto film = new_test_film2 ("ffmpeg_encoder_prores_from_dcp_with_crop", { dcp });
+       dcp->video->set_left_crop (32);
+       dcp->video->set_right_crop (32);
+       film->write_metadata ();
+
+       auto job = make_shared<TranscodeJob>(film);
+       FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::PRORES, false, false, false, 23);
+       encoder.go ();
+}
+
+
+/** DCP -> H264 with crop */
+BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_from_dcp_with_crop)
+{
+       auto dcp = make_shared<DCPContent>("test/data/import_dcp_test2");
+       auto film = new_test_film2 ("ffmpeg_encoder_h264_from_dcp_with_crop", { dcp });
+       dcp->video->set_left_crop (32);
+       dcp->video->set_right_crop (32);
+       film->write_metadata ();
+
+       auto job = make_shared<TranscodeJob>(film);
+       FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::H264_AAC, false, false, false, 23);
+       encoder.go ();
+}