X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_encoder_test.cc;h=c85eb6bd45ba863138294a447b16bb32f71ffc13;hp=74603f6c02699741da1b8ad4fcf593816aa9d774;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=ea63ad9560757e56505551db3bf2e1c31be5c76c diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index 74603f6c0..c85eb6bd4 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -19,19 +19,22 @@ */ +#include "lib/audio_content.h" +#include "lib/compose.hpp" +#include "lib/config.h" +#include "lib/content_factory.h" +#include "lib/dcp_content.h" +#include "lib/dcpomatic_log.h" +#include "lib/ffmpeg_content.h" #include "lib/ffmpeg_encoder.h" +#include "lib/ffmpeg_examiner.h" #include "lib/film.h" -#include "lib/ffmpeg_content.h" #include "lib/image_content.h" -#include "lib/video_content.h" -#include "lib/audio_content.h" -#include "lib/string_text_file_content.h" #include "lib/ratio.h" -#include "lib/transcode_job.h" -#include "lib/dcp_content.h" +#include "lib/string_text_file_content.h" #include "lib/text_content.h" -#include "lib/compose.hpp" -#include "lib/content_factory.h" +#include "lib/transcode_job.h" +#include "lib/video_content.h" #include "test.h" #include @@ -39,7 +42,6 @@ using std::string; using std::shared_ptr; using std::make_shared; -using boost::optional; using namespace dcpomatic; @@ -55,11 +57,14 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f name += "h264"; extension = "mp4"; break; - case ExportFormat::PRORES: - name += "prores"; + case ExportFormat::PRORES_4444: + name += "prores-444"; + extension = "mov"; + break; + case ExportFormat::PRORES_HQ: + name += "prores-hq"; extension = "mov"; break; - case ExportFormat::H264_PCM: case ExportFormat::SUBTITLES_DCP: BOOST_REQUIRE (false); } @@ -67,12 +72,12 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f name = String::compose("%1_test%2", name, number); auto c = make_shared(content); - shared_ptr film = new_test_film2 (name, {c}, &cl); + auto film = new_test_film2 (name, {c}, &cl); film->set_name (name); film->set_audio_channels (6); film->write_metadata (); - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); auto file = boost::filesystem::path("build") / "test" / String::compose("%1.%2", name, extension); cl.add (file); FFmpegEncoder encoder (film, job, file, format, false, false, false, 23); @@ -85,28 +90,28 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f /** Red / green / blue MP4 -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test1) { - ffmpeg_content_test (1, "test/data/test.mp4", ExportFormat::PRORES); + ffmpeg_content_test (1, "test/data/test.mp4", ExportFormat::PRORES_HQ); } /** Dolby Aurora trailer VOB -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test2) { - ffmpeg_content_test (2, TestPaths::private_data() / "dolby_aurora.vob", ExportFormat::PRORES); + ffmpeg_content_test (2, TestPaths::private_data() / "dolby_aurora.vob", ExportFormat::PRORES_HQ); } /** 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", ExportFormat::PRORES); + ffmpeg_content_test (3, TestPaths::private_data() / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", ExportFormat::PRORES_HQ); } /** 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", ExportFormat::PRORES); + ffmpeg_content_test (4, TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov", ExportFormat::PRORES_HQ); } @@ -125,8 +130,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5) c->video->set_length (240); film->write_metadata (); - auto job = make_shared (film); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", ExportFormat::PRORES, false, false, false, 23); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", ExportFormat::PRORES_HQ, false, false, false, 23); encoder.go (); } @@ -147,8 +152,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6) s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); - auto job = make_shared (film); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", ExportFormat::PRORES, false, false, false, 23); + auto job = make_shared (film, TranscodeJob::ChangedBehaviour::IGNORE); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", ExportFormat::PRORES_HQ, false, false, false, 23); encoder.go (); } @@ -172,8 +177,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7) s->only_text()->set_effect (dcp::Effect::SHADOW); s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); - auto job = make_shared (film); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", ExportFormat::PRORES, false, false, false, 23); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", ExportFormat::PRORES_HQ, false, false, false, 23); encoder.go (); } @@ -201,7 +206,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2) s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); - auto job = make_shared (film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", ExportFormat::H264_AAC, false, false, false, 23); encoder.go (); } @@ -227,7 +232,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3) s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); - auto job = make_shared (film); + auto job = make_shared (film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", ExportFormat::H264_AAC, false, false, false, 23); encoder.go (); } @@ -241,7 +246,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test4) film->set_container(Ratio::from_id("185")); - auto job = make_shared(film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", ExportFormat::H264_AAC, false, false, false, 23); encoder.go(); } @@ -296,7 +301,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5) map.set (0, 5, 1); Rs->audio->set_mapping (map); - auto job = make_shared (film); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", ExportFormat::H264_AAC, true, false, false, 23); encoder.go (); @@ -324,12 +329,24 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6) i->set_use (true); } - auto job = make_shared (film2); + auto job = make_shared(film2, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", ExportFormat::H264_AAC, true, false, false, 23); encoder.go (); } +/** Test export of a 3D DCP in a 2D project */ +BOOST_AUTO_TEST_CASE (ffmpeg_encoder_3d_dcp_to_h264) +{ + auto dcp = make_shared(TestPaths::private_data() / "xm"); + auto film2 = new_test_film2 ("ffmpeg_encoder_3d_dcp_to_h264_export", {dcp}); + + auto job = make_shared(film2, TranscodeJob::ChangedBehaviour::IGNORE); + FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_3d_dcp_to_h264.mp4", ExportFormat::H264_AAC, true, false, false, 23); + encoder.go (); +} + + /** Test export of a 3D DCP in a 2D project */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7) { @@ -346,7 +363,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7) auto dcp = make_shared(film->dir(film->dcp_name())); auto film2 = new_test_film2 ("ffmpeg_encoder_h264_test7_export", {dcp}); - auto job = make_shared (film2); + auto job = make_shared (film2, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test7.mp4", ExportFormat::H264_AAC, true, false, false, 23); encoder.go (); } @@ -355,12 +372,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7) /** Stereo project with mixdown-to-stereo set */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8) { - shared_ptr film = new_test_film2("ffmpeg_encoder_h264_test4"); - film->examine_and_add_content(shared_ptr(new DCPContent("test/data/scope_dcp"))); + auto film = new_test_film2("ffmpeg_encoder_h264_test4"); + film->examine_and_add_content(make_shared("test/data/scope_dcp")); BOOST_REQUIRE(!wait_for_jobs()); film->set_audio_channels (2); - shared_ptr job(new TranscodeJob(film)); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test8.mp4", ExportFormat::H264_AAC, true, false, false, 23); encoder.go(); } @@ -371,7 +388,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9) { shared_ptr film = new_test_film ("ffmpeg_encoder_prores_test9"); film->set_name ("ffmpeg_encoder_prores_test9"); - shared_ptr c (new ImageContent(TestPaths::private_data() / "bbc405.png")); + auto c = make_shared(TestPaths::private_data() / "bbc405.png"); film->set_container (Ratio::from_id ("185")); film->set_audio_channels (12); @@ -381,7 +398,93 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9) c->video->set_length (240); film->write_metadata (); - shared_ptr job (new TranscodeJob (film)); + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); 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("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(film, TranscodeJob::ChangedBehaviour::IGNORE); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::PRORES_HQ, 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("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(film, TranscodeJob::ChangedBehaviour::IGNORE); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::H264_AAC, false, false, false, 23); + encoder.go (); +} + + +/** Export to H264 with reels */ +BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_with_reels) +{ + auto content1 = content_factory("test/data/flat_red.png").front(); + auto content2 = content_factory("test/data/flat_red.png").front(); + auto film = new_test_film2 ("ffmpeg_encoder_h264_with_reels", { content1, content2 }); + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); + content1->video->set_length (240); + content2->video->set_length (240); + + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_with_reels.mov", ExportFormat::H264_AAC, false, true, false, 23); + encoder.go (); + + auto check = [](boost::filesystem::path path) { + auto reel = std::dynamic_pointer_cast(content_factory(path).front()); + BOOST_REQUIRE (reel); + FFmpegExaminer examiner(reel); + BOOST_CHECK_EQUAL (examiner.video_length(), 240U); + }; + + check ("build/test/ffmpeg_encoder_h264_with_reels_reel1.mov"); + check ("build/test/ffmpeg_encoder_h264_with_reels_reel2.mov"); +} + + +/** Regression test for "Error during decoding: Butler finished" (#2097) */ +BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_1) +{ + auto content = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv").front(); + auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_1", { content }); + + auto job = make_shared(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 (); +} + + +/** Regression test for Butler video buffers reached 480 frames (audio is 0) (#2101) */ +BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2) +{ + auto logs = dcpomatic_log->types(); + dcpomatic_log->set_types(logs | LogEntry::TYPE_DEBUG_PLAYER); + + auto content = content_factory(TestPaths::private_data() / "tge_clip.mkv").front(); + auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content }); + + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES_HQ, false, true, false, 23); + encoder.go (); + + dcpomatic_log->set_types(logs); +} +