X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=59d85d4c469de2a975d2be2caf4163e5d6422dee;hb=054c8250b5157ce3b080c359c4ec3d1593f6b5c6;hp=52a113cbb4c72d6693faf84677a430cc3fc81e3e;hpb=ed0b3ee0c5a0ba11d3a1a1dfee8e71238bcab4bd;p=dcpomatic.git diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 52a113cbb..59d85d4c4 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -33,8 +33,8 @@ #include "lib/ratio.h" #include "lib/video_content.h" #include "lib/audio_content.h" +#include "lib/dcpomatic_log.h" #include -#include #include #include #include @@ -46,9 +46,9 @@ using std::vector; using std::pair; using std::setw; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; static void help (string n) @@ -65,7 +65,9 @@ help (string n) << " -s, --servers specify servers to use in a text file\n" << " -l, --list-servers just display a list of encoding servers that DCP-o-matic is configured to use; don't encode\n" << " -d, --dcp-path echo DCP's path to stdout on successful completion (implies -n)\n" + << " -c, --config directory containing config.xml and cinemas.xml\n" << " --dump just dump a summary of the film's settings; don't encode\n" + << " --no-check don't check project's content files for changes before making the DCP\n" << "\n" << " is the film directory.\n"; } @@ -74,27 +76,29 @@ static void print_dump (shared_ptr film) { cout << film->dcp_name (true) << "\n" - << film->container()->container_nickname() << " at " << ((film->resolution() == RESOLUTION_2K) ? "2K" : "4K") << "\n" + << film->container()->container_nickname() << " at " << ((film->resolution() == Resolution::TWO_K) ? "2K" : "4K") << "\n" << (film->j2k_bandwidth() / 1000000) << "Mbit/s" << "\n" << "Output " << film->video_frame_rate() << "fps " << (film->three_d() ? "3D" : "2D") << " " << (film->audio_frame_rate() / 1000) << "kHz\n" << (film->interop() ? "Inter-Op" : "SMPTE") << " " << (film->encrypted() ? "encrypted" : "unencrypted") << "\n"; - BOOST_FOREACH (shared_ptr c, film->content ()) { + for (auto c: film->content()) { cout << "\n" << c->path(0) << "\n" << "\tat " << c->position().seconds () - << " length " << c->full_length().seconds () + << " length " << c->full_length(film).seconds () << " start trim " << c->trim_start().seconds () << " end trim " << c->trim_end().seconds () << "\n"; if (c->video) { cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n" - << "\t" << c->active_video_frame_rate() << "fps\n" + << "\t" << c->active_video_frame_rate(film) << "fps\n" << "\tcrop left " << c->video->left_crop() << " right " << c->video->right_crop() << " top " << c->video->top_crop() - << " bottom " << c->video->bottom_crop() << "\n" - << "\tscale " << c->video->scale().name() << "\n"; + << " bottom " << c->video->bottom_crop() << "\n"; + if (c->video->custom_ratio()) { + cout << "\tscale to custom ratio " << *c->video->custom_ratio() << ":1\n"; + } if (c->video->colour_conversion()) { if (c->video->colour_conversion().get().preset()) { cout << "\tcolour conversion " @@ -121,7 +125,7 @@ list_servers () { while (true) { int N = 0; - list servers = EncodeServerFinder::instance()->good_servers (); + auto servers = EncodeServerFinder::instance()->servers(); /* This is a bit fiddly because we want to list configured servers that are down as well as all those (configured and found by broadcast) that are up. @@ -135,18 +139,18 @@ list_servers () ++N; /* Report the state of configured servers */ - BOOST_FOREACH (string i, Config::instance()->servers()) { + for (auto i: Config::instance()->servers()) { cout << std::left << setw(24) << i << " "; /* See if this server is on the active list; if so, remove it and note the number of threads it is offering. */ optional threads; - list::iterator j = servers.begin (); + auto j = servers.begin (); while (j != servers.end ()) { - if (i == j->host_name()) { + if (i == j->host_name() && j->current_link_version()) { threads = j->threads(); - list::iterator tmp = j; + auto tmp = j; ++tmp; servers.erase (j); j = tmp; @@ -163,18 +167,17 @@ list_servers () } /* Now report any left that have been found by broadcast */ - BOOST_FOREACH (EncodeServerDescription const & i, servers) { - cout << std::left << setw(24) << i.host_name() << " UP " << i.threads() << "\n"; + for (auto const& i: servers) { + if (i.current_link_version()) { + cout << std::left << setw(24) << i.host_name() << " UP " << i.threads() << "\n"; + } else { + cout << std::left << setw(24) << i.host_name() << " bad version\n"; + } ++N; } - - /* And those that have a bad version */ - BOOST_FOREACH (EncodeServerDescription i, EncodeServerFinder::instance()->good_servers()) { - cout << std::left << setw(24) << i.host_name() << " bad version\n"; - } } - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); for (int i = 0; i < N; ++i) { cout << "\033[1A\033[2K"; @@ -196,6 +199,8 @@ main (int argc, char* argv[]) optional servers; bool list_servers_ = false; bool dcp_path = false; + optional config; + bool check = true; int option_index = 0; while (true) { @@ -211,12 +216,14 @@ main (int argc, char* argv[]) { "servers", required_argument, 0, 's' }, { "list-servers", no_argument, 0, 'l' }, { "dcp-path", no_argument, 0, 'd' }, + { "config", required_argument, 0, 'c' }, /* Just using A, B, C ... from here on */ { "dump", no_argument, 0, 'A' }, + { "no-check", no_argument, 0, 'B' }, { 0, 0, 0, 0 } }; - int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ld", long_options, &option_index); + int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:B", long_options, &option_index); if (c == -1) { break; @@ -260,11 +267,21 @@ main (int argc, char* argv[]) dcp_path = true; progress = false; break; + case 'c': + config = optarg; + break; + case 'B': + check = false; + break; } } + if (config) { + State::override_path = *config; + } + if (servers) { - FILE* f = fopen_boost (*servers, "r"); + auto f = fopen_boost (*servers, "r"); if (!f) { cerr << "Could not open servers list file " << *servers << "\n"; exit (EXIT_FAILURE); @@ -322,12 +339,13 @@ main (int argc, char* argv[]) exit (EXIT_SUCCESS); } - ContentList content = film->content (); - for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) { - vector paths = (*i)->paths (); - for (vector::const_iterator j = paths.begin(); j != paths.end(); ++j) { - if (!boost::filesystem::exists (*j)) { - cerr << argv[0] << ": content file " << *j << " not found.\n"; + dcpomatic_log = film->log (); + + for (auto i: film->content()) { + auto paths = i->paths(); + for (auto j: paths) { + if (!boost::filesystem::exists(j)) { + cerr << argv[0] << ": content file " << j << " not found.\n"; exit (EXIT_FAILURE); } } @@ -337,69 +355,12 @@ main (int argc, char* argv[]) cout << "\nMaking DCP for " << film->name() << "\n"; } - film->make_dcp (); - - bool should_stop = false; - bool first = true; - bool error = false; - while (!should_stop) { - - dcpomatic_sleep (5); - - list > jobs = JobManager::instance()->get (); - - if (!first && progress) { - for (size_t i = 0; i < jobs.size(); ++i) { - cout << "\033[1A\033[2K"; - } - cout.flush (); - } - - first = false; - - int unfinished = 0; - int finished_in_error = 0; - - BOOST_FOREACH (shared_ptr i, jobs) { - if (progress) { - cout << i->name(); - if (!i->sub_name().empty()) { - cout << "; " << i->sub_name(); - } - cout << ": "; - - if (i->progress ()) { - cout << i->status() << " \n"; - } else { - cout << ": Running \n"; - } - } - - if (!i->finished ()) { - ++unfinished; - } - - if (i->finished_in_error ()) { - ++finished_in_error; - error = true; - } - - if (!progress && i->finished_in_error ()) { - /* We won't see this error if we haven't been showing progress, - so show it now. - */ - cout << i->status() << "\n"; - } - } - - if (unfinished == 0 || finished_in_error != 0) { - should_stop = true; - } - } + film->make_dcp (false, check); + bool const error = show_jobs_on_console (progress); if (keep_going) { while (true) { - dcpomatic_sleep (3600); + dcpomatic_sleep_seconds (3600); } }