X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=a9d1165f14c02a563d93ca268974c2544a0050c0;hb=f76de68a78b2924f61c299a039336bbd50f8adc9;hp=fd950807c3eed51480ed75ecdccea160c0e935a6;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index fd950807c..a9d1165f1 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,8 +29,12 @@
 #include "lib/ratio.h"
 #include "lib/image_content.h"
 #include "lib/video_content.h"
+#include "lib/cross.h"
+#include "lib/dcp_content.h"
+#include <dcp/exceptions.h>
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
 #include <getopt.h>
 #include <string>
 #include <iostream>
@@ -44,6 +48,7 @@ using std::list;
 using std::exception;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
 static void
 syntax (string n)
@@ -52,7 +57,9 @@ syntax (string n)
 	     << "  -v, --version                 show DCP-o-matic version\n"
 	     << "  -h, --help                    show this help\n"
 	     << "  -n, --name <name>             film name\n"
+	     << "  -t, --template <name>         template name\n"
 	     << "  -c, --dcp-content-type <type> FTR, SHR, TLR, TST, XSN, RTG, TSR, POL, PSA or ADV\n"
+	     << "  -f, --dcp-frame-rate <rate>   set DCP video frame rate (otherwise guessed from content)\n"
 	     << "      --container-ratio <ratio> 119, 133, 137, 138, 166, 178, 185 or 239\n"
 	     << "      --content-ratio <ratio>   119, 133, 137, 138, 166, 178, 185 or 239\n"
 	     << "  -s, --still-length <n>        number of seconds that still content should last\n"
@@ -88,12 +95,14 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	string name;
+	optional<string> template_name;
 	DCPContentType const * dcp_content_type = DCPContentType::from_isdcf_name ("TST");
+	optional<int> dcp_frame_rate;
 	Ratio const * container_ratio = 0;
 	Ratio const * content_ratio = 0;
 	int still_length = 10;
 	dcp::Standard standard = dcp::SMPTE;
-	boost::filesystem::path output;
+	optional<boost::filesystem::path> output;
 	bool sign = true;
 	bool use_isdcf_name = true;
 
@@ -103,7 +112,9 @@ main (int argc, char* argv[])
 			{ "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'},
+			{ "dcp-frame-rate", required_argument, 0, 'f'},
 			{ "container-ratio", required_argument, 0, 'A'},
 			{ "content-ratio", required_argument, 0, 'B'},
 			{ "still-length", required_argument, 0, 's'},
@@ -114,7 +125,7 @@ main (int argc, char* argv[])
 			{ 0, 0, 0, 0}
 		};
 
-		int c = getopt_long (argc, argv, "vhn:c:A:B:C:s:o:DE", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhn:f:c:f:A:B:C:s:o:DE", long_options, &option_index);
 		if (c == -1) {
 			break;
 		}
@@ -129,6 +140,9 @@ main (int argc, char* argv[])
 		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) {
@@ -137,6 +151,9 @@ main (int argc, char* argv[])
 				exit (EXIT_FAILURE);
 			}
 			break;
+		case 'f':
+			dcp_frame_rate = atoi (optarg);
+			break;
 		case 'A':
 			container_ratio = Ratio::from_id (optarg);
 			if (container_ratio == 0) {
@@ -206,7 +223,10 @@ main (int argc, char* argv[])
 	}
 
 	try {
-		shared_ptr<Film> film (new Film (output, false));
+		shared_ptr<Film> film (new Film (output));
+		if (template_name) {
+			film->use_template (template_name.get());
+		}
 		film->set_name (name);
 
 		film->set_container (container_ratio);
@@ -216,22 +236,40 @@ main (int argc, char* argv[])
 		film->set_signed (sign);
 
 		for (int i = optind; i < argc; ++i) {
-			shared_ptr<Content> c = content_factory (film, boost::filesystem::canonical (argv[i]));
-			if (c->video) {
-				c->video->set_scale (VideoContentScale (content_ratio));
+			boost::filesystem::path const can = boost::filesystem::canonical (argv[i]);
+			list<shared_ptr<Content> > content;
+
+			if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) {
+				content.push_back (shared_ptr<DCPContent> (new DCPContent (film, can)));
+			} else {
+				/* I guess it's not a DCP */
+				content = content_factory (film, can);
+			}
+
+			BOOST_FOREACH (shared_ptr<Content> j, content) {
+				if (j->video) {
+					j->video->set_scale (VideoContentScale (content_ratio));
+				}
+				film->examine_and_add_content (j);
 			}
-			film->examine_and_add_content (c);
 		}
 
 		JobManager* jm = JobManager::instance ();
 
-		while (jm->work_to_do ()) {}
+		while (jm->work_to_do ()) {
+			dcpomatic_sleep (1);
+		}
+
 		while (signal_manager->ui_idle() > 0) {}
 
+		if (dcp_frame_rate) {
+			film->set_video_frame_rate (*dcp_frame_rate);
+		}
+
 		ContentList content = film->content ();
 		for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 			shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);
-			if (ic) {
+			if (ic && ic->still()) {
 				ic->video->set_length (still_length * 24);
 			}
 		}
@@ -247,7 +285,7 @@ main (int argc, char* argv[])
 			exit (EXIT_FAILURE);
 		}
 
-		if (!output.empty ()) {
+		if (output) {
 			film->write_metadata ();
 		} else {
 			film->metadata()->write_to_stream_formatted (cout, "UTF-8");