X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=40d764c2b64e430e8c6fb6521d3fa760fd39571f;hb=64a5419b16d676d48f36b4699cfe83a91ec78549;hp=8dc4de50ef278dc66a02b9964a9fd146607086a9;hpb=d8a2e55855b50eda28ec7d394449274f5e085bd6;p=dcpomatic.git diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 8dc4de50e..40d764c2b 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -1,35 +1,48 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2019 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 -#include #include "lib/version.h" #include "lib/film.h" #include "lib/util.h" #include "lib/content_factory.h" #include "lib/job_manager.h" -#include "lib/ui_signaller.h" +#include "lib/signal_manager.h" #include "lib/job.h" +#include "lib/dcp_content_type.h" +#include "lib/ratio.h" +#include "lib/image_content.h" +#include "lib/video_content.h" +#include "lib/cross.h" +#include "lib/config.h" +#include "lib/dcp_content.h" +#include "lib/create_cli.h" +#include "lib/version.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include using std::string; using std::cout; @@ -37,100 +50,120 @@ using std::cerr; using std::list; using std::exception; using boost::shared_ptr; +using boost::dynamic_pointer_cast; +using boost::optional; -static void -help (string n) +class SimpleSignalManager : public SignalManager { - cerr << "Create a film directory (ready for making a DCP) from some content files.\n" - << "Syntax: " << n << " [OPTION] [ ...]\n" - << " -v, --version show DCP-o-matic version\n" - << " -h, --help show this help\n" - << " -n, --name film name\n" - << " -o, --output output directory (required)\n"; -} +public: + /* Do nothing in this method so that UI events happen in our thread + when we call SignalManager::ui_idle(). + */ + void wake_ui () {} +}; int main (int argc, char* argv[]) { - string name; - boost::filesystem::path output; - - int option_index = 0; - while (1) { - static struct option long_options[] = { - { "version", no_argument, 0, 'v'}, - { "help", no_argument, 0, 'h'}, - { "name", required_argument, 0, 'n'}, - { "output", required_argument, 0, 'o'}, - { 0, 0, 0, 0} - }; - - int c = getopt_long (argc, argv, "vhn:o:", long_options, &option_index); - if (c == -1) { - break; - } + dcpomatic_setup_path_encoding (); + dcpomatic_setup (); - switch (c) { - case 'v': - cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n"; - exit (EXIT_SUCCESS); - case 'h': - help (argv[0]); - exit (EXIT_SUCCESS); - case 'n': - name = optarg; - break; - case 'o': - output = optarg; - break; - } + CreateCLI cc (argc, argv); + if (cc.error) { + cerr << *cc.error << "\n"; + exit (1); } - if (optind > argc) { - help (argv[0]); - exit (EXIT_FAILURE); + if (cc.version) { + cerr << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n"; + exit (1); } - if (output.empty ()) { - cerr << "Missing required option -o or --output.\n" - << "Use " << argv[0] << " --help for help.\n"; - exit (EXIT_FAILURE); + if (cc.config_dir) { + State::override_path = *cc.config_dir; } - dcpomatic_setup (); - ui_signaller = new UISignaller (); + signal_manager = new SimpleSignalManager (); + JobManager* jm = JobManager::instance (); try { - shared_ptr film (new Film (output)); - if (!name.empty ()) { - film->set_name (name); + shared_ptr film (new Film(cc.output_dir)); + if (cc.template_name) { + film->use_template (cc.template_name.get()); } - - for (int i = optind; i < argc; ++i) { - film->examine_and_add_content (content_factory (film, argv[i])); + film->set_name (cc.name); + + film->set_container (cc.container_ratio); + film->set_dcp_content_type (cc.dcp_content_type); + film->set_interop (cc.standard == dcp::INTEROP); + film->set_use_isdcf_name (!cc.no_use_isdcf_name); + film->set_signed (!cc.no_sign); + film->set_encrypted (cc.encrypt); + film->set_three_d (cc.threed); + film->set_resolution (cc.fourk ? RESOLUTION_4K : RESOLUTION_2K); + if (cc.j2k_bandwidth) { + film->set_j2k_bandwidth (*cc.j2k_bandwidth); } - - JobManager* jm = JobManager::instance (); - while (jm->work_to_do ()) { - ui_signaller->ui_idle (); + + BOOST_FOREACH (CreateCLI::Content i, cc.content) { + boost::filesystem::path const can = boost::filesystem::canonical (i.path); + list > content; + + if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) { + content.push_back (shared_ptr(new DCPContent(can))); + } else { + /* I guess it's not a DCP */ + content = content_factory (can); + } + + BOOST_FOREACH (shared_ptr j, content) { + film->examine_and_add_content (j); + } + + while (jm->work_to_do ()) { + dcpomatic_sleep (1); + } + + while (signal_manager->ui_idle() > 0) {} + + BOOST_FOREACH (shared_ptr j, content) { + if (j->video) { + j->video->set_scale (VideoContentScale(cc.content_ratio)); + j->video->set_frame_type (i.frame_type); + } + } + } + + if (cc.dcp_frame_rate) { + film->set_video_frame_rate (*cc.dcp_frame_rate); + } + + BOOST_FOREACH (shared_ptr i, film->content()) { + shared_ptr ic = dynamic_pointer_cast (i); + if (ic && ic->still()) { + ic->video->set_length (cc.still_length * 24); + } } - + if (jm->errors ()) { - list > jobs = jm->get (); - for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { - if ((*i)->finished_in_error ()) { - cerr << (*i)->error_summary () << "\n" - << (*i)->error_details () << "\n"; + BOOST_FOREACH (shared_ptr i, jm->get()) { + if (i->finished_in_error()) { + cerr << i->error_summary() << "\n" + << i->error_details() << "\n"; } } exit (EXIT_FAILURE); } - - film->write_metadata (); + + if (cc.output_dir) { + film->write_metadata (); + } else { + film->metadata()->write_to_stream_formatted(cout, "UTF-8"); + } } catch (exception& e) { cerr << argv[0] << ": " << e.what() << "\n"; exit (EXIT_FAILURE); } - + return 0; }