summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-04-10 09:34:59 +0100
committerCarl Hetherington <cth@carlh.net>2017-04-10 09:34:59 +0100
commitf789124b96835dbe7951899b06dd62ca9eba9c73 (patch)
tree2d9fe353fe82662bf65b9146de79892281dead56 /src
parenta560a7ffad0af32deb24c15242c9fc25c4e1fe69 (diff)
Add --dcp-frame-rate option to dcpomatic2_create.
Diffstat (limited to 'src')
-rw-r--r--src/tools/dcpomatic_create.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 0a7a48a73..136fbf9c0 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -57,6 +57,7 @@ syntax (string 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"
@@ -94,6 +95,7 @@ main (int argc, char* argv[])
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;
@@ -110,6 +112,7 @@ main (int argc, char* argv[])
{ "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'},
@@ -120,7 +123,7 @@ main (int argc, char* argv[])
{ 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;
}
@@ -146,6 +149,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) {
@@ -244,6 +250,10 @@ main (int argc, char* argv[])
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);