X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcreate_cli.cc;h=a6e13c8bc04a26ed0df26aaabf0c2f9b8b72c4f0;hp=878ee6fddd7fb7ce8ff6719366028164a577b802;hb=b0fc1ec3b159b7a7fa917f2e338485921800374e;hpb=a0d7e38c1b7944ed45cdd6c0292fea33421e8bf5 diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc index 878ee6fdd..a6e13c8bc 100644 --- a/src/lib/create_cli.cc +++ b/src/lib/create_cli.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2019 Carl Hetherington + Copyright (C) 2019-2022 Carl Hetherington This file is part of DCP-o-matic. @@ -18,20 +18,22 @@ */ + +#include "compose.hpp" +#include "config.h" #include "create_cli.h" #include "dcp_content_type.h" #include "ratio.h" -#include "config.h" -#include "compose.hpp" #include +#include #include -#include using std::string; using std::cout; using boost::optional; + string CreateCLI::_help = "\nSyntax: %1 [OPTION] [OPTION] [ ...]\n" " -v, --version show DCP-o-matic version\n" @@ -42,18 +44,22 @@ string CreateCLI::_help = " -c, --dcp-content-type FTR, SHR, TLR, TST, XSN, RTG, TSR, POL, PSA or ADV\n" " -f, --dcp-frame-rate set DCP video frame rate (otherwise guessed from content)\n" " --container-ratio 119, 133, 137, 138, 166, 178, 185 or 239\n" - " --content-ratio 119, 133, 137, 138, 166, 178, 185 or 239\n" " -s, --still-length number of seconds that still content should last\n" " --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 directory containing config.xml and cinemas.xml\n" - " --fourk make a 4K DCP rather than a 2K one\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 output directory\n" " --threed make a 3D DCP\n" " --j2k-bandwidth J2K bandwidth in Mbit/s\n" " --left-eye next piece of content is for the left eye\n" - " --right-eye next piece of content is for the right eye\n"; + " --right-eye next piece of content is for the right eye\n" + " --channel next piece of content should be mapped to audio channel L, R, C, Lfe, Ls or Rs\n" + " --gain next piece of content should have the given audio gain (in dB)\n" + " --cpl CPL ID to use from the next piece of content (which is a DCP)\n" + " --kdm KDM for next piece of content\n"; + template void @@ -73,29 +79,67 @@ argument_option (int& n, int argc, char* argv[], string short_name, string long_ *claimed = true; } + +template +void +argument_option ( + int& n, + int argc, + char* argv[], + string short_name, + string long_name, + bool* claimed, + optional* error, + boost::optional* out, + std::function (string s)> convert = [](string s) { return dcp::raw_convert(s); } + ) +{ + string const a = argv[n]; + if (a != short_name && a != long_name) { + return; + } + + if ((n + 1) >= argc) { + **error = String::compose("%1: option %2 requires an argument", argv[0], long_name); + return; + } + + auto const arg = argv[++n]; + auto const value = convert(arg); + if (!value) { + *error = String::compose("%1: %2 is not valid for %3", argv[0], arg, long_name); + *claimed = true; + return; + } + + *out = value; + *claimed = true; +} + + CreateCLI::CreateCLI (int argc, char* argv[]) : version (false) , encrypt (false) , threed (false) - , dcp_content_type (0) - , container_ratio (0) - , content_ratio (0) + , dcp_content_type (nullptr) + , container_ratio (nullptr) , still_length (10) - , standard (dcp::SMPTE) + , standard (dcp::Standard::SMPTE) , no_use_isdcf_name (false) - , no_sign (false) + , twok (false) , fourk (false) { string dcp_content_type_string = "TST"; - string content_ratio_string; string container_ratio_string; string standard_string = "SMPTE"; int dcp_frame_rate_int = 0; string template_name_string; - string config_dir_string; - string output_dir_string; int j2k_bandwidth_int = 0; - VideoFrameType next_frame_type = VIDEO_FRAME_TYPE_2D; + auto next_frame_type = VideoFrameType::TWO_D; + optional channel; + optional gain; + optional kdm; + optional cpl; int i = 1; while (i < argc) { @@ -116,33 +160,60 @@ CreateCLI::CreateCLI (int argc, char* argv[]) encrypt = claimed = true; } else if (a == "--no-use-isdcf-name") { no_use_isdcf_name = claimed = true; - } else if (a == "--no-sign") { - no_sign = claimed = true; } else if (a == "--threed") { threed = claimed = true; } else if (a == "--left-eye") { - next_frame_type = VIDEO_FRAME_TYPE_3D_LEFT; + next_frame_type = VideoFrameType::THREE_D_LEFT; claimed = true; } else if (a == "--right-eye") { - next_frame_type = VIDEO_FRAME_TYPE_3D_RIGHT; + next_frame_type = VideoFrameType::THREE_D_RIGHT; + claimed = true; + } else if (a == "--twok") { + twok = true; claimed = true; } else if (a == "--fourk") { fourk = true; claimed = true; } + std::function (string s)> string_to_path = [](string s) { + return boost::filesystem::path(s); + }; + 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); 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, "", "--content-ratio", &claimed, &error, &content_ratio_string); argument_option(i, argc, argv, "-s", "--still-length", &claimed, &error, &still_length); argument_option(i, argc, argv, "", "--standard", &claimed, &error, &standard_string); - argument_option(i, argc, argv, "", "--config", &claimed, &error, &config_dir_string); - argument_option(i, argc, argv, "-o", "--output", &claimed, &error, &output_dir_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); + std::function (string)> convert_channel = [](string channel) -> optional{ + if (channel == "L") { + return dcp::Channel::LEFT; + } else if (channel == "R") { + return dcp::Channel::RIGHT; + } else if (channel == "C") { + return dcp::Channel::CENTRE; + } else if (channel == "Lfe") { + return dcp::Channel::LFE; + } else if (channel == "Ls") { + return dcp::Channel::LS; + } else if (channel == "Rs") { + return dcp::Channel::RS; + } else { + return {}; + } + }; + + argument_option(i, argc, argv, "", "--channel", &claimed, &error, &channel, convert_channel); + argument_option(i, argc, argv, "", "--gain", &claimed, &error, &gain); + argument_option(i, argc, argv, "", "--kdm", &claimed, &error, &kdm, string_to_path); + argument_option(i, argc, argv, "", "--cpl", &claimed, &error, &cpl); + if (!claimed) { if (a.length() > 2 && a.substr(0, 2) == "--") { error = String::compose("%1: unrecognised option '%2'", argv[0], a) + String::compose(_help, argv[0]); @@ -151,22 +222,20 @@ CreateCLI::CreateCLI (int argc, char* argv[]) Content c; c.path = a; c.frame_type = next_frame_type; + c.channel = channel; + c.gain = gain; + c.kdm = kdm; + c.cpl = cpl; content.push_back (c); - next_frame_type = VIDEO_FRAME_TYPE_2D; + next_frame_type = VideoFrameType::TWO_D; + channel = {}; + gain = {}; } } ++i; } - if (!config_dir_string.empty()) { - config_dir = config_dir_string; - } - - if (!output_dir_string.empty()) { - output_dir = output_dir_string; - } - if (!template_name_string.empty()) { template_name = template_name_string; } @@ -185,25 +254,12 @@ CreateCLI::CreateCLI (int argc, char* argv[]) return; } - if (content_ratio_string.empty()) { - error = String::compose("%1: missing required option --content-ratio", argv[0]); - return; - } - - content_ratio = Ratio::from_id (content_ratio_string); - if (!content_ratio) { - error = String::compose("%1: unrecognised content ratio %2", content_ratio_string); - return; - } - - if (container_ratio_string.empty()) { - container_ratio_string = content_ratio_string; - } - - container_ratio = Ratio::from_id (container_ratio_string); - if (!container_ratio) { - error = String::compose("%1: unrecognised container ratio %2", argv[0], container_ratio_string); - return; + if (!container_ratio_string.empty()) { + container_ratio = Ratio::from_id (container_ratio_string); + if (!container_ratio) { + error = String::compose("%1: unrecognised container ratio %2", argv[0], container_ratio_string); + return; + } } if (standard_string != "SMPTE" && standard_string != "interop") { @@ -211,6 +267,10 @@ CreateCLI::CreateCLI (int argc, char* argv[]) return; } + if (standard_string == "interop") { + standard = dcp::Standard::INTEROP; + } + if (content.empty()) { error = String::compose("%1: no content specified", argv[0]); return;