Allow specification of the CPL ID to use in a DCP with _create (#2302).

[dcpomatic.git] / src / lib / create_cli.cc

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index 8ea4e143f4efd381a46d1f5089698638c0d6f0c4..a6e13c8bc04a26ed0df26aaabf0c2f9b8b72c4f0 100644 (file)
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -47,14 +47,18 @@ string CreateCLI::_help =
        "  -s, --still-length <n>        number of seconds that still content should last\n"
        "      --standard <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 <dir>            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 <dir>            output directory\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"
-       "      --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 <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 <id>                CPL ID to use from the next piece of content (which is a DCP)\n"
+       "      --kdm <file>              KDM for next piece of content\n";
 
 
 template <class T>
@@ -100,7 +104,15 @@ argument_option (
                return;
        }
 
-       *out = convert(argv[++n]);
+       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;
 }
 
@@ -114,6 +126,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
        , still_length (10)
        , standard (dcp::Standard::SMPTE)
        , no_use_isdcf_name (false)
+       , twok (false)
        , fourk (false)
 {
        string dcp_content_type_string = "TST";
@@ -123,6 +136,10 @@ CreateCLI::CreateCLI (int argc, char* argv[])
        string template_name_string;
        int j2k_bandwidth_int = 0;
        auto next_frame_type = VideoFrameType::TWO_D;
+       optional<dcp::Channel> channel;
+       optional<float> gain;
+       optional<boost::filesystem::path> kdm;
+       optional<std::string> cpl;
 
        int i = 1;
        while (i < argc) {
@@ -151,6 +168,9 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                } else if (a == "--right-eye") {
                        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;
@@ -171,6 +191,29 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                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<optional<dcp::Channel> (string)> convert_channel = [](string channel) -> optional<dcp::Channel>{
+                       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]);
@@ -179,8 +222,14 @@ 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 = VideoFrameType::TWO_D;
+                               channel = {};
+                               gain = {};
                        }
                }