" -h, --help show this help\n"
" -n, --name <name> film name\n"
" -t, --template <name> template name\n"
+ " --no-encrypt make an unencrypted DCP\n"
" -e, --encrypt make an encrypted DCP\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"
" --twok make a 2K DCP instead of choosing a resolution based on the content\n"
" --fourk make a 4K DCP instead of choosing a resolution based on the content\n"
" -o, --output <dir> output directory\n"
+ " --twod make a 2D DCP\n"
" --threed make a 3D DCP\n"
" --j2k-bandwidth <Mbit/s> J2K bandwidth in Mbit/s\n"
" --left-eye next piece of content is for the left eye\n"
CreateCLI::CreateCLI (int argc, char* argv[])
: version (false)
{
- string dcp_content_type_string = "TST";
+ optional<string> dcp_content_type_string;
string container_ratio_string;
- string standard_string = "SMPTE";
+ optional<string> standard_string;
int dcp_frame_rate_int = 0;
string template_name_string;
int j2k_bandwidth_int = 0;
optional<dcp::Channel> channel;
optional<float> gain;
optional<boost::filesystem::path> kdm;
- optional<std::string> cpl;
+ optional<string> cpl;
int i = 1;
while (i < argc) {
return;
}
- if (a == "-e" || a == "--encrypt") {
+ if (a == "--no-encrypt") {
+ _no_encrypt = claimed = true;
+ } else if (a == "-e" || a == "--encrypt") {
_encrypt = claimed = true;
} else if (a == "--no-use-isdcf-name") {
_no_use_isdcf_name = claimed = true;
+ } else if (a == "--twod") {
+ _twod = claimed = true;
} else if (a == "--threed") {
_threed = claimed = true;
} else if (a == "--left-eye") {
argument_option(i, argc, argv, "-n", "--name", &claimed, &error, &_name);
argument_option(i, argc, argv, "-t", "--template", &claimed, &error, &template_name_string);
- argument_option(i, argc, argv, "-c", "--dcp-content-type", &claimed, &error, &dcp_content_type_string);
+ /* See comment below about --cpl */
+ argument_option(i, argc, argv, "-c", "--dcp-content-type", &claimed, &error, &dcp_content_type_string, string_to_string);
argument_option(i, argc, argv, "-f", "--dcp-frame-rate", &claimed, &error, &dcp_frame_rate_int);
argument_option(i, argc, argv, "", "--container-ratio", &claimed, &error, &container_ratio_string);
argument_option(i, argc, argv, "-s", "--still-length", &claimed, &error, &still_length, string_to_nonzero_int);
- argument_option(i, argc, argv, "", "--standard", &claimed, &error, &standard_string);
+ /* See comment below about --cpl */
+ argument_option(i, argc, argv, "", "--standard", &claimed, &error, &standard_string, string_to_string);
argument_option(i, argc, argv, "", "--config", &claimed, &error, &config_dir, string_to_path);
argument_option(i, argc, argv, "-o", "--output", &claimed, &error, &output_dir, string_to_path);
argument_option(i, argc, argv, "", "--j2k-bandwidth", &claimed, &error, &j2k_bandwidth_int);
_j2k_bandwidth = j2k_bandwidth_int * 1000000;
}
- _dcp_content_type = DCPContentType::from_isdcf_name(dcp_content_type_string);
- if (!_dcp_content_type) {
- error = String::compose("%1: unrecognised DCP content type '%2'", argv[0], dcp_content_type_string);
- return;
+ if (dcp_content_type_string) {
+ _dcp_content_type = DCPContentType::from_isdcf_name(*dcp_content_type_string);
+ if (!_dcp_content_type) {
+ error = String::compose("%1: unrecognised DCP content type '%2'", argv[0], *dcp_content_type_string);
+ return;
+ }
}
if (!container_ratio_string.empty()) {
}
}
- if (standard_string != "SMPTE" && standard_string != "interop") {
- error = String::compose("%1: standard must be SMPTE or interop", argv[0]);
- return;
+ if (standard_string) {
+ if (*standard_string == "interop") {
+ _standard = dcp::Standard::INTEROP;
+ } else if (*standard_string == "SMPTE") {
+ _standard = dcp::Standard::SMPTE;
+ } else {
+ error = String::compose("%1: standard must be SMPTE or interop", argv[0]);
+ return;
+ }
}
- if (standard_string == "interop") {
- _standard = dcp::Standard::INTEROP;
+ if (_twod && _threed) {
+ error = String::compose("%1: specify one of --twod or --threed, not both", argv[0]);
+ }
+
+ if (_no_encrypt && _encrypt) {
+ error = String::compose("%1: specify one of --no-encrypt or --encrypt, not both", argv[0]);
}
if (content.empty()) {
}
if (_name.empty()) {
- _name = content[0].path.leaf().string();
+ _name = content[0].path.filename().string();
}
if (_j2k_bandwidth && (*_j2k_bandwidth < 10000000 || *_j2k_bandwidth > Config::instance()->maximum_j2k_bandwidth())) {
dcpomatic_log->set_types(Config::instance()->log_types());
if (_template_name) {
film->use_template(_template_name.get());
+ } else {
+ /* No template: apply our own CLI tool defaults to override the ones in Config.
+ * Maybe one day there will be no defaults in Config any more (as they'll be in
+ * a default template) and we can decide whether to use the default template
+ * or not.
+ */
+ film->set_interop(false);
+ film->set_dcp_content_type(DCPContentType::from_isdcf_name("TST"));
}
film->set_name(_name);
if (_container_ratio) {
film->set_container(_container_ratio);
}
- film->set_dcp_content_type(_dcp_content_type);
- film->set_interop(_standard == dcp::Standard::INTEROP);
+ if (_dcp_content_type) {
+ film->set_dcp_content_type(_dcp_content_type);
+ }
+ if (_standard) {
+ film->set_interop(*_standard == dcp::Standard::INTEROP);
+ }
film->set_use_isdcf_name(!_no_use_isdcf_name);
- film->set_encrypted(_encrypt);
- film->set_three_d(_threed);
+ if (_no_encrypt) {
+ film->set_encrypted(false);
+ } else if (_encrypt) {
+ film->set_encrypted(true);
+ }
+ if (_twod) {
+ film->set_three_d(false);
+ } else if (_threed) {
+ film->set_three_d(true);
+ }
if (_twok) {
film->set_resolution(Resolution::TWO_K);
}
channels = std::max(channels, static_cast<int>(*cli_content.channel) + 1);
}
}
- if (channels % 1) {
+ if (channels % 2) {
++channels;
}
projects / dcpomatic.git / blobdiff