X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=fd950807c3eed51480ed75ecdccea160c0e935a6;hp=c75f8f9539ffe9f06d9b4d61936304ae038a7301;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index c75f8f953..fd950807c 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -1,38 +1,41 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2016 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 +#include +#include +#include +#include +#include +#include using std::string; using std::cout; @@ -43,12 +46,9 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; static void -help (string n) +syntax (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 << " [OPTION] [ ...]\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" @@ -56,14 +56,27 @@ help (string 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"; } -class SimpleUISignaller : public UISignaller +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: /* Do nothing in this method so that UI events happen in our thread - when we call UISignaller::ui_idle(). + when we call SignalManager::ui_idle(). */ void wake_ui () {} }; @@ -71,17 +84,21 @@ public: int main (int argc, char* argv[]) { + dcpomatic_setup_path_encoding (); dcpomatic_setup (); string name; - DCPContentType const * dcp_content_type = DCPContentType::from_dci_name ("TST"); + 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 (1) { + while (true) { static struct option long_options[] = { { "version", no_argument, 0, 'v'}, { "help", no_argument, 0, 'h'}, @@ -90,11 +107,14 @@ main (int argc, char* argv[]) { "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:c:A:B:s:o:", long_options, &option_index); + int c = getopt_long (argc, argv, "vhn:c:A:B:C:s:o:DE", long_options, &option_index); if (c == -1) { break; } @@ -110,10 +130,10 @@ main (int argc, char* argv[]) name = optarg; break; case 'c': - dcp_content_type = DCPContentType::from_dci_name (optarg); + dcp_content_type = DCPContentType::from_isdcf_name (optarg); if (dcp_content_type == 0) { cerr << "Bad DCP content type.\n"; - help (argv[0]); + syntax (argv[0]); exit (EXIT_FAILURE); } break; @@ -121,7 +141,7 @@ main (int argc, char* argv[]) container_ratio = Ratio::from_id (optarg); if (container_ratio == 0) { cerr << "Bad container ratio.\n"; - help (argv[0]); + syntax (argv[0]); exit (EXIT_FAILURE); } break; @@ -129,16 +149,34 @@ main (int argc, char* argv[]) content_ratio = Ratio::from_id (optarg); if (content_ratio == 0) { cerr << "Bad content ratio " << optarg << ".\n"; - help (argv[0]); + 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); } } @@ -161,36 +199,40 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } - ui_signaller = new SimpleUISignaller (); + signal_manager = new SimpleSignalManager (); + + if (name.empty ()) { + name = boost::filesystem::path (argv[optind]).leaf().string (); + } try { shared_ptr film (new Film (output, false)); - if (!name.empty ()) { - film->set_name (name); - } + film->set_name (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); + for (int i = optind; i < argc; ++i) { - shared_ptr c = content_factory (film, argv[i]); - shared_ptr vc = dynamic_pointer_cast (c); - if (vc) { - vc->set_scale (VideoContentScale (content_ratio)); + shared_ptr c = content_factory (film, boost::filesystem::canonical (argv[i])); + if (c->video) { + c->video->set_scale (VideoContentScale (content_ratio)); } film->examine_and_add_content (c); } - + JobManager* jm = JobManager::instance (); while (jm->work_to_do ()) {} - while (ui_signaller->ui_idle() > 0) {} + while (signal_manager->ui_idle() > 0) {} ContentList content = film->content (); for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { shared_ptr ic = dynamic_pointer_cast (*i); if (ic) { - ic->set_video_length (ContentTime::from_seconds (still_length)); + ic->video->set_length (still_length * 24); } } @@ -214,6 +256,6 @@ main (int argc, char* argv[]) cerr << argv[0] << ": " << e.what() << "\n"; exit (EXIT_FAILURE); } - + return 0; }