/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
#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 <dcp/exceptions.h>
#include <libxml++/libxml++.h>
#include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
#include <getopt.h>
#include <string>
#include <iostream>
using std::exception;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
+using boost::optional;
static void
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"
<< " --standard <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"
+ << " --config <dir> directory containing config.xml and cinemas.xml\n"
<< " -o, --output <dir> output directory\n";
}
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;
+ optional<boost::filesystem::path> config;
int option_index = 0;
while (true) {
{ "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'},
{ "no-use-isdcf-name", no_argument, 0, 'D'},
{ "no-sign", no_argument, 0, 'E'},
{ "output", required_argument, 0, 'o'},
+ { "config", required_argument, 0, 'F'},
{ 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:DEF:", long_options, &option_index);
if (c == -1) {
break;
}
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) {
exit (EXIT_FAILURE);
}
break;
+ case 'f':
+ dcp_frame_rate = atoi (optarg);
+ break;
case 'A':
container_ratio = Ratio::from_id (optarg);
if (container_ratio == 0) {
case 'E':
sign = false;
break;
+ case 'F':
+ config = optarg;
+ break;
case 's':
still_length = atoi (optarg);
break;
exit (EXIT_FAILURE);
}
+ if (config) {
+ Config::override_path = *config;
+ }
+
if (!content_ratio) {
cerr << argv[0] << ": missing required option --content-ratio.\n";
exit (EXIT_FAILURE);
}
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);
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) {
- ic->video->set_video_length (still_length * 24);
+ if (ic && ic->still()) {
+ ic->video->set_length (still_length * 24);
}
}
exit (EXIT_FAILURE);
}
- if (!output.empty ()) {
+ if (output) {
film->write_metadata ();
} else {
film->metadata()->write_to_stream_formatted (cout, "UTF-8");