X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcreate_cli.cc;h=b670282b4717a0bfcbc3988b391a55cd1f5d1bcb;hb=591ccb82d75070d7cba55995bab23513741ff5cf;hp=e1c5f1233cc45790fa12e918c23109cdd0cf6fca;hpb=5bb7cf0132f37e2eea67c72f61d1f2b23b440596;p=dcpomatic.git

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index e1c5f1233..b670282b4 100644
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -21,6 +21,7 @@
 #include "create_cli.h"
 #include "dcp_content_type.h"
 #include "ratio.h"
+#include "config.h"
 #include "compose.hpp"
 #include <dcp/raw_convert.h>
 #include <string>
@@ -41,7 +42,6 @@ string CreateCLI::_help =
 	"  -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"
 	"      --standard <standard>     SMPTE or interop (default SMPTE)\n"
 	"      --no-use-isdcf-name       do not use an ISDCF name; use the specified name unmodified\n"
@@ -50,6 +50,7 @@ string CreateCLI::_help =
 	"      --fourk                   make a 4K DCP rather than a 2K one\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";
 
@@ -76,9 +77,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 	, encrypt (false)
 	, threed (false)
 	, dcp_content_type (0)
-	, dcp_frame_rate (24)
 	, container_ratio (0)
-	, content_ratio (0)
 	, still_length (10)
 	, standard (dcp::SMPTE)
 	, no_use_isdcf_name (false)
@@ -86,13 +85,13 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 	, 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;
 
 	int i = 1;
@@ -134,11 +133,11 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 		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, "",   "--j2k-bandwidth",    &claimed, &error, &j2k_bandwidth_int);
 
 		if (!claimed) {
 			if (a.length() > 2 && a.substr(0, 2) == "--") {
@@ -172,31 +171,22 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 		dcp_frame_rate = dcp_frame_rate_int;
 	}
 
+	if (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 (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") {
@@ -212,4 +202,9 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 	if (name.empty()) {
 		name = content[0].path.leaf().string();
 	}
+
+	if (j2k_bandwidth && (*j2k_bandwidth < 10000000 || *j2k_bandwidth > Config::instance()->maximum_j2k_bandwidth())) {
+		error = String::compose("%1: j2k-bandwidth must be between 10 and %2 Mbit/s", argv[0], (Config::instance()->maximum_j2k_bandwidth() / 1000000));
+		return;
+	}
 }