X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_encoder_test.cc;h=dc57b473b48a3174ea080b8e2f3df545b680d260;hb=HEAD;hp=c3e8c9a81a8ccafa2713eac29325be836c8dbf41;hpb=c522d113d91f95fa78e017e6edce6a6d64e37778;p=dcpomatic.git diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index c3e8c9a81..dc57b473b 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -22,8 +22,11 @@ #include "lib/audio_content.h" #include "lib/compose.hpp" #include "lib/config.h" +#include "lib/constants.h" #include "lib/content_factory.h" +#include "lib/cross.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" @@ -35,12 +38,14 @@ #include "lib/transcode_job.h" #include "lib/video_content.h" #include "test.h" +#include +#include #include -using std::string; -using std::shared_ptr; using std::make_shared; +using std::string; +using std::vector; using namespace dcpomatic; @@ -56,11 +61,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); } @@ -68,12 +76,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); @@ -86,28 +94,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); } @@ -126,8 +134,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 (); } @@ -148,8 +156,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 (); } @@ -173,8 +181,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 (); } @@ -202,7 +210,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 (); } @@ -228,7 +236,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 (); } @@ -242,7 +250,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(); } @@ -297,7 +305,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 (); @@ -318,14 +326,14 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6) film2->examine_and_add_content (ov); BOOST_REQUIRE (!wait_for_jobs()); ov->set_reference_video (true); - auto subs = content_factory("test/data/subrip.srt").front(); + auto subs = content_factory("test/data/subrip.srt")[0]; film2->examine_and_add_content (subs); BOOST_REQUIRE (!wait_for_jobs()); for (auto i: subs->text) { 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 (); } @@ -337,7 +345,7 @@ 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); + 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 (); } @@ -359,21 +367,33 @@ 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 (); } +BOOST_AUTO_TEST_CASE(ffmpeg_encoder_2d_content_in_3d_project) +{ + auto content = make_shared(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(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) { - 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(); } @@ -382,9 +402,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 = new_test_film ("ffmpeg_encoder_prores_test9"); + auto c = make_shared(TestPaths::private_data() / "bbc405.png"); + auto film = new_test_film2("ffmpeg_encoder_prores_test9", { c }); film->set_name ("ffmpeg_encoder_prores_test9"); - shared_ptr c (new ImageContent(TestPaths::private_data() / "bbc405.png")); film->set_container (Ratio::from_id ("185")); film->set_audio_channels (12); @@ -394,7 +414,7 @@ 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 (); } @@ -409,8 +429,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_from_dcp_with_crop) dcp->video->set_right_crop (32); film->write_metadata (); - auto job = make_shared(film); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::PRORES, false, false, false, 23); + 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 (); } @@ -424,7 +444,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_from_dcp_with_crop) dcp->video->set_right_crop (32); film->write_metadata (); - auto job = make_shared(film); + 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 (); } @@ -433,19 +453,19 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_from_dcp_with_crop) /** 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 content1 = content_factory("test/data/flat_red.png")[0]; + auto content2 = content_factory("test/data/flat_red.png")[0]; 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); + 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()); + auto reel = std::dynamic_pointer_cast(content_factory(path)[0]); BOOST_REQUIRE (reel); FFmpegExaminer examiner(reel); BOOST_CHECK_EQUAL (examiner.video_length(), 240U); @@ -459,28 +479,77 @@ 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) { - auto content = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv").front(); + 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(film); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_1.mov", ExportFormat::PRORES, false, true, false, 23); + 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 (); + + 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) { - auto logs = Config::instance()->log_types(); - Config::instance()->set_log_types(logs | LogEntry::TYPE_DEBUG_PLAYER); + Cleanup cl; + + 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 content = content_factory(TestPaths::private_data() / "tge_clip.mkv")[0]; auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content }); - auto job = make_shared(film); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES, false, true, false, 23); + 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 (); - Config::instance()->set_log_types(logs); + dcpomatic_log->set_types(logs); + + cl.add("build/test/ffmpeg_encoder_prores_regression_2.mov"); + cl.run(); +} + + +BOOST_AUTO_TEST_CASE(ffmpeg_encoder_missing_frame_at_end) +{ + auto content = content_factory(TestPaths::private_data() / "1s1f.mov"); + auto film = new_test_film2("ffmpeg_encoder_missing_frame_at_end", content); + + boost::filesystem::path output("build/test/ffmpeg_encoder_missing_frame_at_end.mov"); + boost::filesystem::path log("build/test/ffmpeg_encoder_missing_frame_at_end.log"); + + auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); + FFmpegEncoder encoder(film, job, output, ExportFormat::PRORES_HQ, false, true, false, 23); + encoder.go(); + + run_ffprobe(output, log, false, "-show_frames -show_format -show_streams -select_streams v:0"); + + dcp::File read_log(log, "r"); + BOOST_REQUIRE(read_log); + + int nb_read_frames = 0; + int nb_frames = 0; + char buffer[256]; + + while (!read_log.eof()) { + read_log.gets(buffer, sizeof(buffer)); + vector parts; + boost::algorithm::split(parts, buffer, boost::is_any_of("=")); + if (parts.size() == 2) { + if (parts[0] == "nb_read_frames") { + nb_read_frames = dcp::raw_convert(parts[1]); + } else if (parts[0] == "nb_frames") { + nb_frames = dcp::raw_convert(parts[1]); + } + } + } + + BOOST_CHECK_EQUAL(nb_frames, 26); + BOOST_CHECK_EQUAL(nb_read_frames, 26); }