X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=2d70fb578cd1b0629e904a1fb65702b3fa5c6b6f;hp=0307cac9c9712ddb2205a2aab1aae4bedba7df80;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=6f0a590bc3266f21ba577116219bd019e891d480 diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 0307cac9c..2d70fb578 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -1,26 +1,23 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2017 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include -#include -#include -#include #include "lib/film.h" #include "lib/filter.h" #include "lib/transcode_job.h" @@ -31,41 +28,180 @@ #include "lib/config.h" #include "lib/log.h" #include "lib/signal_manager.h" -#include "lib/server_finder.h" +#include "lib/encode_server_finder.h" #include "lib/json_server.h" +#include "lib/ratio.h" +#include "lib/video_content.h" +#include "lib/audio_content.h" +#include "lib/dcpomatic_log.h" +#include +#include +#include +#include +#include using std::string; using std::cerr; using std::cout; using std::vector; using std::pair; +using std::setw; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; +using std::dynamic_pointer_cast; static void help (string n) { - cerr << "Syntax: " << n << " [OPTION] \n" - << " -v, --version show DCP-o-matic version\n" - << " -h, --help show this help\n" - << " -f, --flags show flags passed to C++ compiler on build\n" - << " -n, --no-progress do not print progress to stdout\n" - << " -r, --no-remote do not use any remote servers\n" - << " -j, --json run a JSON server on the specified port\n" - << " -k, --keep-going keep running even when the job is complete\n" + cerr << "Syntax: " << n << " [OPTION] []\n" + << " -v, --version show DCP-o-matic version\n" + << " -h, --help show this help\n" + << " -f, --flags show flags passed to C++ compiler on build\n" + << " -n, --no-progress do not print progress to stdout\n" + << " -r, --no-remote do not use any remote servers\n" + << " -t, --threads specify number of local encoding threads (overriding configuration)\n" + << " -j, --json run a JSON server on the specified port\n" + << " -k, --keep-going keep running even when the job is complete\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"; } +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->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 ()) { + cout << "\n" + << c->path(0) << "\n" + << "\tat " << c->position().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(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"; + 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 " + << PresetColourConversion::all()[c->video->colour_conversion().get().preset().get()].name + << "\n"; + } else { + cout << "\tcustom colour conversion\n"; + } + } else { + cout << "\tno colour conversion\n"; + } + + } + + if (c->audio) { + cout << "\t" << c->audio->delay() << " delay\n" + << "\t" << c->audio->gain() << " gain\n"; + } + } +} + +static void +list_servers () +{ + while (true) { + int N = 0; + list 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. + */ + + if (servers.empty() && Config::instance()->servers().empty()) { + cout << "No encoding servers found or configured.\n"; + ++N; + } else { + cout << std::left << setw(24) << "Host" << " Status Threads\n"; + ++N; + + /* Report the state of configured servers */ + BOOST_FOREACH (string 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 (); + while (j != servers.end ()) { + if (i == j->host_name() && j->current_link_version()) { + threads = j->threads(); + list::iterator tmp = j; + ++tmp; + servers.erase (j); + j = tmp; + } else { + ++j; + } + } + if (static_cast(threads)) { + cout << "UP " << threads.get() << "\n"; + } else { + cout << "DOWN\n"; + } + ++N; + } + + /* Now report any left that have been found by broadcast */ + BOOST_FOREACH (EncodeServerDescription 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; + } + } + + dcpomatic_sleep_seconds (1); + + for (int i = 0; i < N; ++i) { + cout << "\033[1A\033[2K"; + } + } +} + + int main (int argc, char* argv[]) { - string film_dir; + boost::filesystem::path film_dir; bool progress = true; bool no_remote = false; + optional threads; optional json_port; bool keep_going = false; + bool dump = false; + optional servers; + bool list_servers_ = false; + bool dcp_path = false; + optional config; + bool check = true; int option_index = 0; while (true) { @@ -75,12 +211,20 @@ main (int argc, char* argv[]) { "flags", no_argument, 0, 'f'}, { "no-progress", no_argument, 0, 'n'}, { "no-remote", no_argument, 0, 'r'}, + { "threads", required_argument, 0, 't'}, { "json", required_argument, 0, 'j'}, { "keep-going", no_argument, 0, 'k' }, + { "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, "vhfnrj:k", long_options, &option_index); + int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:B", long_options, &option_index); if (c == -1) { break; @@ -102,13 +246,61 @@ main (int argc, char* argv[]) case 'r': no_remote = true; break; + case 't': + threads = atoi (optarg); + break; case 'j': json_port = atoi (optarg); break; case 'k': keep_going = true; break; + case 'A': + dump = true; + break; + case 's': + servers = optarg; + break; + case 'l': + list_servers_ = true; + break; + case 'd': + 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"); + if (!f) { + cerr << "Could not open servers list file " << *servers << "\n"; + exit (EXIT_FAILURE); + } + vector servers; + while (!feof (f)) { + char buffer[128]; + if (fscanf (f, "%s.127", buffer) == 1) { + servers.push_back (buffer); + } } + fclose (f); + Config::instance()->set_servers (servers); + } + + if (list_servers_) { + list_servers (); + exit (EXIT_SUCCESS); } if (optind >= argc) { @@ -117,34 +309,39 @@ main (int argc, char* argv[]) } film_dir = argv[optind]; - + + dcpomatic_setup_path_encoding (); dcpomatic_setup (); signal_manager = new SignalManager (); - + if (no_remote) { - ServerFinder::instance()->disable (); + EncodeServerFinder::instance()->stop (); } if (json_port) { new JSONServer (json_port.get ()); } - cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit; - char buf[256]; - if (gethostname (buf, 256) == 0) { - cout << " on " << buf; + if (threads) { + Config::instance()->set_master_encoding_threads (threads.get ()); } - cout << "\n"; shared_ptr film; try { film.reset (new Film (film_dir)); film->read_metadata (); } catch (std::exception& e) { - cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n"; + cerr << argv[0] << ": error reading film `" << film_dir.string() << "' (" << e.what() << ")\n"; exit (EXIT_FAILURE); } + if (dump) { + print_dump (film); + exit (EXIT_SUCCESS); + } + + dcpomatic_log = film->log (); + ContentList content = film->content (); for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) { vector paths = (*i)->paths (); @@ -155,66 +352,17 @@ 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) { - cout << "\033[" << jobs.size() << "A"; - cout.flush (); - } - - first = false; - - int unfinished = 0; - int finished_in_error = 0; - - for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { - if (progress) { - cout << (*i)->name() << ": "; - - 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; - } + if (progress) { + cout << "\nMaking DCP for " << film->name() << "\n"; } + 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); } } @@ -223,9 +371,11 @@ main (int argc, char* argv[]) */ JobManager::drop (); - ServerFinder::drop (); - + EncodeServerFinder::drop (); + + if (dcp_path && !error) { + cout << film->dir (film->dcp_name (false)).string() << "\n"; + } + return error ? EXIT_FAILURE : EXIT_SUCCESS; } - -