X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=d78aef3df117ac346552c0e10386b92f314aac25;hp=0582f5cac0d5701ac2912faccf675355ecd9ff84;hb=5f206d32ff60148ab72b35d5823f56bdbb7f50bf;hpb=3476f2f8251d5800abdd968963cac57b0df8a657 diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 0582f5cac..d78aef3df 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -18,64 +18,43 @@ */ -#include "lib/version.h" -#include "lib/film.h" -#include "lib/util.h" +#include "lib/audio_content.h" +#include "lib/config.h" #include "lib/content_factory.h" -#include "lib/job_manager.h" -#include "lib/signal_manager.h" -#include "lib/job.h" +#include "lib/create_cli.h" +#include "lib/cross.h" +#include "lib/dcp_content.h" #include "lib/dcp_content_type.h" -#include "lib/ratio.h" +#include "lib/dcpomatic_log.h" +#include "lib/film.h" #include "lib/image_content.h" +#include "lib/job.h" +#include "lib/job_manager.h" +#include "lib/ratio.h" +#include "lib/signal_manager.h" +#include "lib/util.h" +#include "lib/version.h" +#include "lib/version.h" #include "lib/video_content.h" -#include "lib/cross.h" +#include #include #include -#include #include -#include -#include #include +#include #include +#include -using std::string; -using std::cout; using std::cerr; -using std::list; +using std::cout; +using std::dynamic_pointer_cast; using std::exception; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::list; +using std::make_shared; +using std::shared_ptr; +using std::string; using boost::optional; -static void -syntax (string n) -{ - cerr << "Syntax: " << n << " [OPTION] [ ...]\n" - << " -v, --version show DCP-o-matic version\n" - << " -h, --help show this help\n" - << " -n, --name film name\n" - << " -t, --template template name\n" - << " -c, --dcp-content-type FTR, SHR, TLR, TST, XSN, RTG, TSR, POL, PSA or ADV\n" - << " --container-ratio 119, 133, 137, 138, 166, 178, 185 or 239\n" - << " --content-ratio 119, 133, 137, 138, 166, 178, 185 or 239\n" - << " -s, --still-length number of seconds that still content should last\n" - << " --standard SMPTE or interop (default SMPTE)\n" - << " --no-use-isdcf-name do not use an ISDCF name; use the specified name unmodified\n" - << " --no-sign do not sign the DCP\n" - << " -o, --output output directory\n"; -} - -static void -help (string n) -{ - cerr << "Create a film directory (ready for making a DCP) or metadata file from some content files.\n" - << "A film directory will be created if -o or --output is specified, otherwise a metadata file\n" - << "will be written to stdout.\n"; - - syntax (n); -} - class SimpleSignalManager : public SignalManager { public: @@ -91,182 +70,110 @@ main (int argc, char* argv[]) dcpomatic_setup_path_encoding (); dcpomatic_setup (); - string name; - optional template_name; - DCPContentType const * dcp_content_type = DCPContentType::from_isdcf_name ("TST"); - Ratio const * container_ratio = 0; - Ratio const * content_ratio = 0; - int still_length = 10; - dcp::Standard standard = dcp::SMPTE; - boost::filesystem::path output; - bool sign = true; - bool use_isdcf_name = true; - - int option_index = 0; - while (true) { - static struct option long_options[] = { - { "version", no_argument, 0, 'v'}, - { "help", no_argument, 0, 'h'}, - { "name", required_argument, 0, 'n'}, - { "template", required_argument, 0, 'f'}, - { "dcp-content-type", required_argument, 0, 'c'}, - { "container-ratio", required_argument, 0, 'A'}, - { "content-ratio", required_argument, 0, 'B'}, - { "still-length", required_argument, 0, 's'}, - { "standard", required_argument, 0, 'C'}, - { "no-use-isdcf-name", no_argument, 0, 'D'}, - { "no-sign", no_argument, 0, 'E'}, - { "output", required_argument, 0, 'o'}, - { 0, 0, 0, 0} - }; - - int c = getopt_long (argc, argv, "vhn:f:c:A:B:C:s:o:DE", long_options, &option_index); - if (c == -1) { - break; - } - - 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 't': - template_name = optarg; - break; - case 'c': - dcp_content_type = DCPContentType::from_isdcf_name (optarg); - if (dcp_content_type == 0) { - cerr << "Bad DCP content type.\n"; - syntax (argv[0]); - exit (EXIT_FAILURE); - } - break; - case 'A': - container_ratio = Ratio::from_id (optarg); - if (container_ratio == 0) { - cerr << "Bad container ratio.\n"; - syntax (argv[0]); - exit (EXIT_FAILURE); - } - break; - case 'B': - content_ratio = Ratio::from_id (optarg); - if (content_ratio == 0) { - cerr << "Bad content ratio " << optarg << ".\n"; - syntax (argv[0]); - exit (EXIT_FAILURE); - } - break; - case 'C': - if (strcmp (optarg, "interop") == 0) { - standard = dcp::INTEROP; - } else if (strcmp (optarg, "SMPTE") != 0) { - cerr << "Bad standard " << optarg << ".\n"; - syntax (argv[0]); - exit (EXIT_FAILURE); - } - break; - case 'D': - use_isdcf_name = false; - break; - case 'E': - sign = false; - break; - case 's': - still_length = atoi (optarg); - break; - case 'o': - output = optarg; - break; - case '?': - syntax (argv[0]); - exit (EXIT_FAILURE); - } + CreateCLI cc (argc, argv); + if (cc.error) { + cerr << *cc.error << "\n"; + exit (1); } - if (optind > argc) { - help (argv[0]); - exit (EXIT_FAILURE); - } - - if (!content_ratio) { - cerr << argv[0] << ": missing required option --content-ratio.\n"; - exit (EXIT_FAILURE); + if (cc.version) { + cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n"; + exit (EXIT_SUCCESS); } - if (!container_ratio) { - container_ratio = content_ratio; - } - - if (optind == argc) { - cerr << argv[0] << ": no content specified.\n"; - exit (EXIT_FAILURE); + if (cc.config_dir) { + State::override_path = *cc.config_dir; } signal_manager = new SimpleSignalManager (); - - if (name.empty ()) { - name = boost::filesystem::path (argv[optind]).leaf().string (); - } + auto jm = JobManager::instance (); try { - shared_ptr film (new Film (output)); - if (template_name) { - film->use_template (template_name.get()); + auto film = std::make_shared(cc.output_dir); + dcpomatic_log = film->log (); + dcpomatic_log->set_types (Config::instance()->log_types()); + if (cc.template_name) { + film->use_template (cc.template_name.get()); } - film->set_name (name); + film->set_name (cc.name); - film->set_container (container_ratio); - film->set_dcp_content_type (dcp_content_type); - film->set_interop (standard == dcp::INTEROP); - film->set_use_isdcf_name (use_isdcf_name); - film->set_signed (sign); + if (cc.container_ratio) { + film->set_container (cc.container_ratio); + } + film->set_dcp_content_type (cc.dcp_content_type); + film->set_interop (cc.standard == dcp::Standard::INTEROP); + film->set_use_isdcf_name (!cc.no_use_isdcf_name); + film->set_encrypted (cc.encrypt); + film->set_three_d (cc.threed); + if (cc.fourk) { + film->set_resolution (Resolution::FOUR_K); + } + if (cc.j2k_bandwidth) { + film->set_j2k_bandwidth (*cc.j2k_bandwidth); + } - for (int i = optind; i < argc; ++i) { - BOOST_FOREACH (shared_ptr j, content_factory (film, boost::filesystem::canonical (argv[i]))) { - if (j->video) { - j->video->set_scale (VideoContentScale (content_ratio)); - } + for (auto 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 (make_shared(can)); + } else { + /* I guess it's not a DCP */ + content = content_factory (can); + } + + for (auto j: content) { film->examine_and_add_content (j); } - } - JobManager* jm = JobManager::instance (); + while (jm->work_to_do ()) { + dcpomatic_sleep_seconds (1); + } + + while (signal_manager->ui_idle() > 0) {} - while (jm->work_to_do ()) { - dcpomatic_sleep (1); + for (auto j: content) { + if (j->video) { + j->video->set_frame_type (i.frame_type); + } + if (j->audio && i.channel) { + for (auto stream: j->audio->streams()) { + AudioMapping mapping(stream->channels(), film->audio_channels()); + for (int channel = 0; channel < stream->channels(); ++channel) { + mapping.set(channel, *i.channel, 1.0f); + } + stream->set_mapping (mapping); + } + } + } } - while (signal_manager->ui_idle() > 0) {} + if (cc.dcp_frame_rate) { + film->set_video_frame_rate (*cc.dcp_frame_rate); + } - ContentList content = film->content (); - for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { - shared_ptr ic = dynamic_pointer_cast (*i); - if (ic) { - ic->video->set_length (still_length * 24); + for (auto i: film->content()) { + auto 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"; + for (auto i: jm->get()) { + if (i->finished_in_error()) { + cerr << i->error_summary() << "\n" + << i->error_details() << "\n"; } } exit (EXIT_FAILURE); } - if (!output.empty ()) { + if (cc.output_dir) { film->write_metadata (); } else { - film->metadata()->write_to_stream_formatted (cout, "UTF-8"); + film->metadata()->write_to_stream_formatted(cout, "UTF-8"); } } catch (exception& e) { cerr << argv[0] << ": " << e.what() << "\n";