X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffile_naming_test.cc;h=0b76952a8a72e61e83a34e8febd32823495cd590;hb=7981ff2fe80ec88954e0f3eb4ff3c6e634c872f6;hp=f06fdfa42fa211f6fa2f85353e56cecce9b44153;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc index f06fdfa42..0b76952a8 100644 --- a/test/file_naming_test.cc +++ b/test/file_naming_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016 Carl Hetherington + Copyright (C) 2016-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,21 +18,30 @@ */ + /** @file test/file_naming_test.cc * @brief Test how files in DCPs are named. - * @ingroup specific + * @ingroup feature */ + #include "test.h" #include "lib/config.h" #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/dcp_content_type.h" +#include "lib/video_content.h" +#ifdef DCPOMATIC_WINDOWS +#include +#endif #include #include + using std::string; -using boost::shared_ptr; +using std::shared_ptr; +using std::make_shared; + class Keep { @@ -51,36 +60,50 @@ private: dcp::NameFormat _format; }; + BOOST_AUTO_TEST_CASE (file_naming_test) { Keep k; - Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c")); + Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat("%c")); - shared_ptr film = new_test_film ("file_naming_test"); + auto film = new_test_film ("file_naming_test"); film->set_name ("file_naming_test"); + film->set_video_frame_rate (24); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); - shared_ptr r (new FFmpegContent("test/data/flat_red.png")); + auto r = make_shared("test/data/flat_red.png"); film->examine_and_add_content (r); - shared_ptr g (new FFmpegContent("test/data/flat_green.png")); + auto g = make_shared("test/data/flat_green.png"); film->examine_and_add_content (g); - shared_ptr b (new FFmpegContent("test/data/flat_blue.png")); + auto b = make_shared("test/data/flat_blue.png"); film->examine_and_add_content (b); - wait_for_jobs (); - - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); + + r->set_position (film, dcpomatic::DCPTime::from_seconds(0)); + r->set_video_frame_rate (24); + r->video->set_length (24); + g->set_position (film, dcpomatic::DCPTime::from_seconds(1)); + g->set_video_frame_rate (24); + g->video->set_length (24); + b->set_position (film, dcpomatic::DCPTime::from_seconds(2)); + b->set_video_frame_rate (24); + b->video->set_length (24); + + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); + film->write_metadata (); + make_and_verify_dcp ( + film, + { + dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE, + dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE + }); int got[3] = { 0, 0, 0 }; - for ( - boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->file(film->dcp_name())); - i != boost::filesystem::directory_iterator(); - ++i) { - if (boost::regex_match(i->path().string(), boost::regex(".*flat_red\\.png_.*\\.mxf"))) { + for (auto i: boost::filesystem::directory_iterator(film->file(film->dcp_name()))) { + if (boost::regex_match(i.path().string(), boost::regex(".*flat_red\\.png_.*\\.mxf"))) { ++got[0]; - } else if (boost::regex_match(i->path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) { + } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) { ++got[1]; - } else if (boost::regex_match(i->path().string(), boost::regex(".*flat_blue\\.png_.*\\.mxf"))) { + } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_blue\\.png_.*\\.mxf"))) { ++got[2]; } } @@ -90,36 +113,55 @@ BOOST_AUTO_TEST_CASE (file_naming_test) } } + BOOST_AUTO_TEST_CASE (file_naming_test2) { Keep k; Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c")); - shared_ptr film = new_test_film ("file_naming_test2"); + auto film = new_test_film ("file_naming_test2"); film->set_name ("file_naming_test2"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); - shared_ptr r (new FFmpegContent("test/data/flät_red.png")); + +#ifdef DCPOMATIC_WINDOWS + /* This is necessary so that the UTF8 string constant below gets converted properly */ + std::locale::global(boost::locale::generator().generate("")); + boost::filesystem::path::imbue(std::locale()); +#endif + + auto r = make_shared("test/data/flät_red.png"); film->examine_and_add_content (r); - shared_ptr g (new FFmpegContent("test/data/flat_green.png")); + auto g = make_shared("test/data/flat_green.png"); film->examine_and_add_content (g); - shared_ptr b (new FFmpegContent("test/data/flat_blue.png")); + auto b = make_shared("test/data/flat_blue.png"); film->examine_and_add_content (b); - wait_for_jobs (); - - film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); - film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); + + r->set_position (film, dcpomatic::DCPTime::from_seconds(0)); + r->set_video_frame_rate (24); + r->video->set_length (24); + g->set_position (film, dcpomatic::DCPTime::from_seconds(1)); + g->set_video_frame_rate (24); + g->video->set_length (24); + b->set_position (film, dcpomatic::DCPTime::from_seconds(2)); + b->set_video_frame_rate (24); + b->video->set_length (24); + + film->set_reel_type (ReelType::BY_VIDEO_CONTENT); + make_and_verify_dcp ( + film, + { + dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE, + dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE + }); int got[3] = { 0, 0, 0 }; - for ( - boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->file(film->dcp_name())); - i != boost::filesystem::directory_iterator(); - ++i) { - if (boost::regex_match(i->path().string(), boost::regex(".*flt_red\\.png_.*\\.mxf"))) { + for (auto i: boost::filesystem::directory_iterator (film->file(film->dcp_name()))) { + if (boost::regex_match(i.path().string(), boost::regex(".*flat_red\\.png_.*\\.mxf"))) { ++got[0]; - } else if (boost::regex_match(i->path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) { + } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) { ++got[1]; - } else if (boost::regex_match(i->path().string(), boost::regex(".*flat_blue\\.png_.*\\.mxf"))) { + } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_blue\\.png_.*\\.mxf"))) { ++got[2]; } }