X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=80e10daaf08299a7483ff551266b2c0522563dce;hp=f55a425ce6a521d48719bee761f74a294023d878;hb=17df947ac256397311a11894062070f8069c7e75;hpb=b6c780d3107557d452c6612d715d01e2be52dbda diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index f55a425ce..80e10daaf 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,68 +17,186 @@ */ -#include -#include -#include -#include #include "lib/film.h" #include "lib/filter.h" #include "lib/transcode_job.h" #include "lib/job_manager.h" #include "lib/util.h" -#include "lib/scaler.h" #include "lib/version.h" #include "lib/cross.h" #include "lib/config.h" #include "lib/log.h" -#include "lib/ui_signaller.h" -#include "lib/server_finder.h" +#include "lib/signal_manager.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 +#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 boost::optional; +using boost::dynamic_pointer_cast; static void help (string n) { - cerr << "Syntax: " << n << " [OPTION] \n" + cerr << "Syntax: " << n << " [OPTION] []\n" << " -v, --version show DCP-o-matic version\n" << " -h, --help show this help\n" - << " -d, --deps list DCP-o-matic dependency details and quit\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" + << " -s, --servers just display a list of encoding servers that DCP-o-matic is configured to use; don't encode\n" + << " --dump just dump a summary of the film's settings; don't encode\n" << "\n" << " is the film directory.\n"; } +static void +print_dump (shared_ptr film) +{ + cout << film->dcp_name (true) << "\n" + << film->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().seconds () + << " start trim " << c->trim_start().seconds () + << " end trim " << c->trim_end().seconds () << "\n"; + + shared_ptr video = dynamic_pointer_cast (c); + if (video) { + cout << "\t" << video->video_size().width << "x" << video->video_size().height << "\n" + << "\t" << video->video_frame_rate() << "fps\n" + << "\tcrop left " << video->left_crop() + << " right " << video->right_crop() + << " top " << video->top_crop() + << " bottom " << video->bottom_crop() << "\n" + << "\tscale " << video->scale().name() << "\n"; + if (video->colour_conversion()) { + if (video->colour_conversion().get().preset()) { + cout << "\tcolour conversion " + << PresetColourConversion::all()[video->colour_conversion().get().preset().get()].name + << "\n"; + } else { + cout << "\tcustom colour conversion\n"; + } + } else { + cout << "\tno colour conversion\n"; + } + + } + + shared_ptr audio = dynamic_pointer_cast (c); + if (audio) { + cout << "\t" << audio->audio_delay() << " delay\n" + << "\t" << audio->audio_gain() << " gain\n"; + } + } +} + +static void +show_servers () +{ + while (true) { + int N = 0; + list servers = EncodeServerFinder::instance()->servers (); + + if (Config::instance()->use_any_servers ()) { + if (servers.empty ()) { + cout << "No encoding servers found.\n"; + ++N; + } else { + cout << std::left << setw(24) << "Host" << " Threads\n"; + ++N; + BOOST_FOREACH (EncodeServerDescription const & i, servers) { + cout << std::left << setw(24) << i.host_name() << " " << i.threads() << "\n"; + ++N; + } + } + } else { + vector configured_servers = Config::instance()->servers(); + if (configured_servers.empty()) { + cout << "No configured servers, and DCP-o-matic is not set to search for any server.\n"; + ++N; + } else { + cout << std::left << setw(24) << "Host" << " Status Threads\n"; + ++N; + BOOST_FOREACH (string const & i, Config::instance()->servers()) { + cout << std::left << setw(24) << i << " "; + optional threads; + BOOST_FOREACH (EncodeServerDescription const & j, servers) { + if (i == j.host_name()) { + threads = j.threads(); + } + } + if (static_cast(threads)) { + cout << "UP " << threads.get() << "\n"; + } else { + cout << "DOWN\n"; + } + ++N; + } + } + } + + + dcpomatic_sleep (1); + + for (int i = 0; i < N; ++i) { + cout << "\033[1A\033[2K"; + } + } +} + + int main (int argc, char* argv[]) { string film_dir; bool progress = true; bool no_remote = false; + optional json_port; bool keep_going = false; + bool dump = false; + bool servers = false; int option_index = 0; while (true) { static struct option long_options[] = { { "version", no_argument, 0, 'v'}, { "help", no_argument, 0, 'h'}, - { "deps", no_argument, 0, 'd'}, { "flags", no_argument, 0, 'f'}, { "no-progress", no_argument, 0, 'n'}, { "no-remote", no_argument, 0, 'r'}, + { "json", required_argument, 0, 'j'}, { "keep-going", no_argument, 0, 'k' }, + { "servers", no_argument, 0, 's' }, + /* Just using A, B, C ... from here on */ + { "dump", no_argument, 0, 'A' }, { 0, 0, 0, 0 } }; - int c = getopt_long (argc, argv, "vhdfnrk", long_options, &option_index); + int c = getopt_long (argc, argv, "vhfnrj:kAs", long_options, &option_index); if (c == -1) { break; @@ -91,9 +209,6 @@ main (int argc, char* argv[]) case 'h': help (argv[0]); exit (EXIT_SUCCESS); - case 'd': - cout << dependency_version_summary () << "\n"; - exit (EXIT_SUCCESS); case 'f': cout << dcpomatic_cxx_flags << "\n"; exit (EXIT_SUCCESS); @@ -103,32 +218,44 @@ main (int argc, char* argv[]) case 'r': no_remote = true; break; + case 'j': + json_port = atoi (optarg); + break; case 'k': keep_going = true; break; + case 'A': + dump = true; + break; + case 's': + servers = true; + break; } } + if (servers) { + show_servers (); + exit (EXIT_SUCCESS); + } + if (optind >= argc) { help (argv[0]); exit (EXIT_FAILURE); } film_dir = argv[optind]; - + + dcpomatic_setup_path_encoding (); dcpomatic_setup (); - ui_signaller = new UISignaller (); + signal_manager = new SignalManager (); if (no_remote) { - ServerFinder::instance()->disable (); + EncodeServerFinder::instance()->disable (); } - cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit; - char buf[256]; - if (gethostname (buf, 256) == 0) { - cout << " on " << buf; + if (json_port) { + new JSONServer (json_port.get ()); } - cout << "\n"; shared_ptr film; try { @@ -139,6 +266,11 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } + if (dump) { + print_dump (film); + exit (EXIT_SUCCESS); + } + ContentList content = film->content (); for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) { vector paths = (*i)->paths (); @@ -149,8 +281,10 @@ main (int argc, char* argv[]) } } } - - cout << "\nMaking DCP for " << film->name() << "\n"; + + if (progress) { + cout << "\nMaking DCP for " << film->name() << "\n"; + } film->make_dcp (); @@ -164,7 +298,9 @@ main (int argc, char* argv[]) list > jobs = JobManager::instance()->get (); if (!first && progress) { - cout << "\033[" << jobs.size() << "A"; + for (size_t i = 0; i < jobs.size(); ++i) { + cout << "\033[1A\033[2K"; + } cout.flush (); } @@ -176,10 +312,8 @@ main (int argc, char* argv[]) for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { if (progress) { cout << (*i)->name() << ": "; - - float const p = (*i)->progress (); - - if (p >= 0) { + + if ((*i)->progress ()) { cout << (*i)->status() << " \n"; } else { cout << ": Running \n"; @@ -218,8 +352,8 @@ main (int argc, char* argv[]) indirectly holding onto codecs. */ JobManager::drop (); - + + EncodeServerFinder::drop (); + return error ? EXIT_FAILURE : EXIT_SUCCESS; } - -