X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=d4d4df29b814f109066c0d87dc1ad3ae910a0288;hb=78bc6f9286864052b304a1871739479c16e393dd;hp=8dc4de50ef278dc66a02b9964a9fd146607086a9;hpb=d8a2e55855b50eda28ec7d394449274f5e085bd6;p=dcpomatic.git diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 8dc4de50e..d4d4df29b 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -28,8 +28,11 @@ #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" using std::string; using std::cout; @@ -37,35 +40,61 @@ using std::cerr; using std::list; using std::exception; using boost::shared_ptr; +using boost::dynamic_pointer_cast; static void help (string n) { - cerr << "Create a film directory (ready for making a DCP) from some content files.\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" - << " -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"; + << " -v, --version show DCP-o-matic version\n" + << " -h, --help show this help\n" + << " -n, --name film 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" + << " -o, --output output directory\n"; } +class SimpleSignalManager : public SignalManager +{ +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[]) { + dcpomatic_setup (); + string 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; boost::filesystem::path output; - + int option_index = 0; - while (1) { + while (true) { static struct option long_options[] = { { "version", no_argument, 0, 'v'}, { "help", no_argument, 0, 'h'}, { "name", required_argument, 0, 'n'}, + { "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'}, { "output", required_argument, 0, 'o'}, { 0, 0, 0, 0} }; - int c = getopt_long (argc, argv, "vhn:o:", long_options, &option_index); + int c = getopt_long (argc, argv, "vhn:c:A:B:s:o:", long_options, &option_index); if (c == -1) { break; } @@ -80,6 +109,33 @@ main (int argc, char* argv[]) case 'n': name = optarg; break; + case 'c': + dcp_content_type = DCPContentType::from_isdcf_name (optarg); + if (dcp_content_type == 0) { + cerr << "Bad DCP content type.\n"; + help (argv[0]); + exit (EXIT_FAILURE); + } + break; + case 'A': + container_ratio = Ratio::from_id (optarg); + if (container_ratio == 0) { + cerr << "Bad container ratio.\n"; + help (argv[0]); + exit (EXIT_FAILURE); + } + break; + case 'B': + content_ratio = Ratio::from_id (optarg); + if (content_ratio == 0) { + cerr << "Bad content ratio " << optarg << ".\n"; + help (argv[0]); + exit (EXIT_FAILURE); + } + break; + case 's': + still_length = atoi (optarg); + break; case 'o': output = optarg; break; @@ -91,30 +147,53 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } - if (output.empty ()) { - cerr << "Missing required option -o or --output.\n" - << "Use " << argv[0] << " --help for help.\n"; + if (!content_ratio) { + cerr << argv[0] << ": missing required option --content-ratio.\n"; exit (EXIT_FAILURE); } - dcpomatic_setup (); - ui_signaller = new UISignaller (); + if (!container_ratio) { + container_ratio = content_ratio; + } + + if (optind == argc) { + cerr << argv[0] << ": no content specified.\n"; + exit (EXIT_FAILURE); + } + + signal_manager = new SimpleSignalManager (); try { - shared_ptr film (new Film (output)); + shared_ptr film (new Film (output, false)); if (!name.empty ()) { film->set_name (name); } - + + film->set_container (container_ratio); + film->set_dcp_content_type (dcp_content_type); + for (int i = optind; i < argc; ++i) { - film->examine_and_add_content (content_factory (film, argv[i])); + shared_ptr c = content_factory (film, argv[i]); + shared_ptr vc = dynamic_pointer_cast (c); + if (vc) { + vc->set_scale (VideoContentScale (content_ratio)); + } + film->examine_and_add_content (c); } - + JobManager* jm = JobManager::instance (); - while (jm->work_to_do ()) { - ui_signaller->ui_idle (); + + while (jm->work_to_do ()) {} + 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 (still_length * 24); + } } - + if (jm->errors ()) { list > jobs = jm->get (); for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { @@ -125,12 +204,16 @@ main (int argc, char* argv[]) } exit (EXIT_FAILURE); } - - film->write_metadata (); + + if (!output.empty ()) { + 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; }