X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=dae904eb44335199a54fdcfb081a46c9bbd445ee;hb=8a8c977c12fc65f1f50ea05099387e0fc8840e7d;hp=6a243e126e6a9140cf693a70c5067683758cca0a;hpb=f0a2a52ddd1118236d4ce5640339c24bae88aa12;p=dcpomatic.git diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 6a243e126..dae904eb4 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington + Copyright (C) 2012-2022 Carl Hetherington This file is part of DCP-o-matic. @@ -18,71 +18,79 @@ */ + +#include "lib/audio_content.h" +#include "lib/config.h" +#include "lib/cross.h" +#include "lib/dcpomatic_log.h" +#include "lib/encode_server_finder.h" +#include "lib/ffmpeg_encoder.h" #include "lib/film.h" #include "lib/filter.h" -#include "lib/transcode_job.h" #include "lib/job_manager.h" -#include "lib/util.h" -#include "lib/version.h" -#include "lib/cross.h" -#include "lib/config.h" -#include "lib/log.h" -#include "lib/signal_manager.h" -#include "lib/encode_server_finder.h" #include "lib/json_server.h" +#include "lib/log.h" +#include "lib/make_dcp.h" #include "lib/ratio.h" +#include "lib/signal_manager.h" +#include "lib/transcode_job.h" +#include "lib/util.h" +#include "lib/version.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::dynamic_pointer_cast; +using std::list; using std::pair; +using std::runtime_error; using std::setw; -using std::list; -using boost::shared_ptr; +using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; -using boost::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" - << " -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" + << " -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" + << " --export-format export project to a file, rather than making a DCP: specify mov or mp4\n" + << " --export-filename filename to export to with --export-format\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->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 () @@ -93,11 +101,13 @@ print_dump (shared_ptr film) 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" - << "\tscale " << c->video->scale().name() << "\n"; + << "\tcrop left " << c->video->requested_left_crop() + << " right " << c->video->requested_right_crop() + << " top " << c->video->requested_top_crop() + << " bottom " << c->video->requested_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 " @@ -119,12 +129,13 @@ print_dump (shared_ptr film) } } + static void list_servers () { while (true) { int N = 0; - list servers = EncodeServerFinder::instance()->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. @@ -138,18 +149,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() && j->current_link_version()) { threads = j->threads(); - list::iterator tmp = j; + auto tmp = j; ++tmp; servers.erase (j); j = tmp; @@ -166,7 +177,7 @@ list_servers () } /* Now report any left that have been found by broadcast */ - BOOST_FOREACH (EncodeServerDescription const & i, servers) { + for (auto const& i: servers) { if (i.current_link_version()) { cout << std::left << setw(24) << i.host_name() << " UP " << i.threads() << "\n"; } else { @@ -200,6 +211,8 @@ main (int argc, char* argv[]) bool dcp_path = false; optional config; bool check = true; + optional export_format; + optional export_filename; int option_index = 0; while (true) { @@ -219,10 +232,12 @@ main (int argc, char* argv[]) /* Just using A, B, C ... from here on */ { "dump", no_argument, 0, 'A' }, { "no-check", no_argument, 0, 'B' }, + { "export-format", required_argument, 0, 'C' }, + { "export-filename", required_argument, 0, 'D' }, { 0, 0, 0, 0 } }; - int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:B", long_options, &option_index); + int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:BC:D:", long_options, &option_index); if (c == -1) { break; @@ -272,6 +287,12 @@ main (int argc, char* argv[]) case 'B': check = false; break; + case 'C': + export_format = optarg; + break; + case 'D': + export_filename = optarg; + break; } } @@ -280,19 +301,18 @@ main (int argc, char* argv[]) } if (servers) { - FILE* f = fopen_boost (*servers, "r"); + dcp::File f(*servers, "r"); if (!f) { cerr << "Could not open servers list file " << *servers << "\n"; exit (EXIT_FAILURE); } vector servers; - while (!feof (f)) { + while (!f.eof()) { char buffer[128]; - if (fscanf (f, "%s.127", buffer) == 1) { + if (fscanf(f.get(), "%s.127", buffer) == 1) { servers.push_back (buffer); } } - fclose (f); Config::instance()->set_servers (servers); } @@ -306,13 +326,28 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } + if (export_format && !export_filename) { + cerr << "Argument --export-filename is required with --export-format\n"; + exit (EXIT_FAILURE); + } + + if (!export_format && export_filename) { + cerr << "Argument --export-format is required with --export-filename\n"; + exit (EXIT_FAILURE); + } + + if (export_format && *export_format != "mp4" && *export_format != "mov") { + cerr << "Unrecognised export format: must be mp4 or mov\n"; + exit (EXIT_FAILURE); + } + film_dir = argv[optind]; dcpomatic_setup_path_encoding (); dcpomatic_setup (); signal_manager = new SignalManager (); - if (no_remote) { + if (no_remote || export_format) { EncodeServerFinder::instance()->stop (); } @@ -340,22 +375,44 @@ main (int argc, char* argv[]) dcpomatic_log = film->log (); - 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"; + 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); } } } if (progress) { - cout << "\nMaking DCP for " << film->name() << "\n"; + if (export_format) { + cout << "\nExporting " << film->name() << "\n"; + } else { + cout << "\nMaking DCP for " << film->name() << "\n"; + } + } + + TranscodeJob::ChangedBehaviour const behaviour = check ? TranscodeJob::ChangedBehaviour::STOP : TranscodeJob::ChangedBehaviour::IGNORE; + + if (export_format) { + auto job = std::make_shared(film, behaviour); + job->set_encoder ( + std::make_shared ( + film, job, *export_filename, *export_format == "mp4" ? ExportFormat::H264_AAC : ExportFormat::PRORES, false, false, false, 23 + ) + ); + JobManager::instance()->add (job); + } else { + try { + make_dcp (film, behaviour); + } catch (runtime_error& e) { + std::cerr << "Could not make DCP: " << e.what() << "\n"; + exit(EXIT_FAILURE); + } } - film->make_dcp (false, check); + make_dcp (film, behaviour); bool const error = show_jobs_on_console (progress); if (keep_going) {