/*
- 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.
#include "config.h"
#include "create_cli.h"
#include "dcp_content_type.h"
+#include "dcpomatic_log.h"
+#include "film.h"
#include "ratio.h"
#include <dcp/raw_convert.h>
#include <iostream>
#include <string>
-using std::string;
using std::cout;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::vector;
using boost::optional;
" --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"
- " --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";
+ " --channel <channel> next piece of content should be mapped to audio channel L, R, C, Lfe, Ls, Rs, BsL, BsR, HI, VI\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>
CreateCLI::CreateCLI (int argc, char* argv[])
: version (false)
- , encrypt (false)
- , threed (false)
- , dcp_content_type (nullptr)
- , container_ratio (nullptr)
- , still_length (10)
- , standard (dcp::Standard::SMPTE)
- , no_use_isdcf_name (false)
- , twok (false)
- , fourk (false)
{
string dcp_content_type_string = "TST";
string container_ratio_string;
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) {
claimed = true;
}
+ std::function<optional<string> (string s)> string_to_string = [](string s) {
+ return s;
+ };
+
std::function<optional<boost::filesystem::path> (string s)> string_to_path = [](string s) {
return boost::filesystem::path(s);
};
+ std::function<optional<int> (string s)> string_to_nonzero_int = [](string s) {
+ auto const value = dcp::raw_convert<int>(s);
+ if (value == 0) {
+ return boost::optional<int>();
+ }
+ return boost::optional<int>(value);
+ };
+
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, "-s", "--still-length", &claimed, &error, &still_length);
+ 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);
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);
return dcp::Channel::LS;
} else if (channel == "Rs") {
return dcp::Channel::RS;
+ } else if (channel == "BsL") {
+ return dcp::Channel::BSL;
+ } else if (channel == "BsR") {
+ return dcp::Channel::BSR;
+ } else if (channel == "HI") {
+ return dcp::Channel::HI;
+ } else if (channel == "VI") {
+ return dcp::Channel::VI;
} 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);
+ /* It shouldn't be necessary to use this string_to_string here, but using the other argument_option()
+ * causes an odd compile error on Ubuntu 18.04.
+ */
+ argument_option(i, argc, argv, "", "--cpl", &claimed, &error, &cpl, string_to_string);
if (!claimed) {
if (a.length() > 2 && a.substr(0, 2) == "--") {
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 = {};
return;
}
}
+
+
+shared_ptr<Film>
+CreateCLI::make_film() const
+{
+ auto film = std::make_shared<Film>(output_dir);
+ dcpomatic_log = film->log();
+ dcpomatic_log->set_types(Config::instance()->log_types());
+ if (template_name) {
+ film->use_template(template_name.get());
+ }
+ 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);
+ film->set_use_isdcf_name(!no_use_isdcf_name);
+ film->set_encrypted(encrypt);
+ film->set_three_d(threed);
+ if (twok) {
+ film->set_resolution(Resolution::TWO_K);
+ }
+ if (fourk) {
+ film->set_resolution(Resolution::FOUR_K);
+ }
+ if (j2k_bandwidth) {
+ film->set_j2k_bandwidth(*j2k_bandwidth);
+ }
+
+ int channels = 6;
+ for (auto cli_content: content) {
+ if (cli_content.channel) {
+ channels = std::max(channels, static_cast<int>(*cli_content.channel) + 1);
+ }
+ }
+ if (channels % 1) {
+ ++channels;
+ }
+
+ film->set_audio_channels(channels);
+
+ return film;
+}
+
projects / dcpomatic.git / blobdiff