projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a560a7f
)
Add --dcp-frame-rate option to dcpomatic2_create.
author
Carl Hetherington
<cth@carlh.net>
Mon, 10 Apr 2017 08:34:59 +0000
(09:34 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 10 Apr 2017 08:34:59 +0000
(09:34 +0100)
src/tools/dcpomatic_create.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_create.cc
b/src/tools/dcpomatic_create.cc
index 0a7a48a73551d017be26a29459a34125fabf08cb..136fbf9c0319790e33606cd085e3844267df2f46 100644
(file)
--- 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"
<< " -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"
<< " --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");
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;
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'},
{ "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'},
{ "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}
};
{ 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;
}
if (c == -1) {
break;
}
@@
-146,6
+149,9
@@
main (int argc, char* argv[])
exit (EXIT_FAILURE);
}
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) {
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) {}
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);
ContentList content = film->content ();
for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);