/*
- 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.
#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>
<< " -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"
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;
{ "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'},
{ 0, 0, 0, 0}
};
- int c = getopt_long (argc, argv, "vhn:f: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;
}
exit (EXIT_FAILURE);
}
break;
+ case 'f':
+ dcp_frame_rate = atoi (optarg);
+ break;
case 'A':
container_ratio = Ratio::from_id (optarg);
if (container_ratio == 0) {
film->set_signed (sign);
for (int i = optind; i < argc; ++i) {
- BOOST_FOREACH (shared_ptr<Content> j, content_factory (film, boost::filesystem::canonical (argv[i]))) {
+ 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));
}
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);
}
}