Rename j2k_bandwidth -> video_bit_rate.

16 files changed, 77 insertions, 65 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index fb7a413de..1400b9309 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -108,7 +108,7 @@ Config::set_defaults ()
 	_default_still_length = 10;
 	_default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR");
 	_default_dcp_audio_channels = 8;
-	_default_j2k_bandwidth = 150000000;
+	_default_video_bit_rate = 150000000;
 	_default_audio_delay = 0;
 	_default_interop = false;
 	_default_metadata.clear ();
@@ -127,7 +127,7 @@ Config::set_defaults ()
 	_notification_bcc = "";
 	_check_for_updates = false;
 	_check_for_test_updates = false;
-	_maximum_j2k_bandwidth = 250000000;
+	_maximum_video_bit_rate = 250000000;
 	_log_types = LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DISK;
 	_analyse_ebur128 = true;
 	_automatic_audio_analysis = false;
@@ -375,7 +375,11 @@ try
 	_dcp_j2k_comment = f.optional_string_child("DCPJ2KComment").get_value_or("");
 
 	_default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
-	_default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
+	if (auto j2k = f.optional_number_child<int>("DefaultJ2KBandwidth")) {
+		_default_video_bit_rate = *j2k;
+	} else {
+		_default_video_bit_rate = f.optional_number_child<int64_t>("DefaultVideoBitRate").get_value_or(200000000);
+	}
 	_default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
 	_default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false);
 
@@ -450,7 +454,11 @@ try
 	_check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false);
 	_check_for_test_updates = f.optional_bool_child("CheckForTestUpdates").get_value_or (false);
 
-	_maximum_j2k_bandwidth = f.optional_number_child<int> ("MaximumJ2KBandwidth").get_value_or (250000000);
+	if (auto j2k = f.optional_number_child<int>("MaximumJ2KBandwidth")) {
+		_maximum_video_bit_rate = *j2k;
+	} else {
+		_maximum_video_bit_rate = f.optional_number_child<int64_t>("MaximumVideoBitRate").get_value_or(250000000);
+	}
 	_allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate").get_value_or (false);
 	_allow_any_container = f.optional_bool_child ("AllowAnyContainer").get_value_or (false);
 	_allow_96khz_audio = f.optional_bool_child("Allow96kHzAudio").get_value_or(false);
@@ -807,8 +815,8 @@ Config::write_config () const
 
 	/* [XML] DefaultStillLength Default length (in seconds) for still images in new films. */
 	cxml::add_text_child(root, "DefaultStillLength", raw_convert<string>(_default_still_length));
-	/* [XML] DefaultJ2KBandwidth Default bitrate (in bits per second) for JPEG2000 data in new films. */
-	cxml::add_text_child(root, "DefaultJ2KBandwidth", raw_convert<string>(_default_j2k_bandwidth));
+	/* [XML] DefaultVideoBitRate Default bitrate (in bits per second) for JPEG2000 or MPEG2 data in new films. */
+	cxml::add_text_child(root, "DefaultVideoBitRate", raw_convert<string>(_default_video_bit_rate));
 	/* [XML] DefaultAudioDelay Default delay to apply to audio (positive moves audio later) in milliseconds. */
 	cxml::add_text_child(root, "DefaultAudioDelay", raw_convert<string>(_default_audio_delay));
 	/* [XML] DefaultInterop 1 to default new films to Interop, 0 for SMPTE. */
@@ -888,8 +896,8 @@ Config::write_config () const
 	/* [XML] CheckForUpdates 1 to check dcpomatic.com for new text versions, 0 to check only on request. */
 	cxml::add_text_child(root, "CheckForTestUpdates", _check_for_test_updates ? "1" : "0");
 
-	/* [XML] MaximumJ2KBandwidth Maximum J2K bandwidth (in bits per second) that can be specified in the GUI. */
-	cxml::add_text_child(root, "MaximumJ2KBandwidth", raw_convert<string>(_maximum_j2k_bandwidth));
+	/* [XML] MaximumVideoBitRate Maximum video bit rate (in bits per second) that can be specified in the GUI. */
+	cxml::add_text_child(root, "MaximumVideoBitRate", raw_convert<string>(_maximum_video_bit_rate));
 	/* [XML] AllowAnyDCPFrameRate 1 to allow users to specify any frame rate when creating DCPs, 0 to limit the GUI to standard rates. */
 	cxml::add_text_child(root, "AllowAnyDCPFrameRate", _allow_any_dcp_frame_rate ? "1" : "0");
 	/* [XML] AllowAnyContainer 1 to allow users to user any container ratio for their DCP, 0 to limit the GUI to DCI Flat/Scope */
diff --git a/src/lib/config.h b/src/lib/config.h
index ec804c9bf..05421c20a 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -232,8 +232,8 @@ public:
 		return _dcp_j2k_comment;
 	}
 
-	int default_j2k_bandwidth () const {
-		return _default_j2k_bandwidth;
+	int64_t default_video_bit_rate() const {
+		return _default_video_bit_rate;
 	}
 
 	int default_audio_delay () const {
@@ -348,8 +348,8 @@ public:
 		return _check_for_test_updates;
 	}
 
-	int maximum_j2k_bandwidth () const {
-		return _maximum_j2k_bandwidth;
+	int64_t maximum_video_bit_rate() const {
+		return _maximum_video_bit_rate;
 	}
 
 	int log_types () const {
@@ -810,8 +810,8 @@ public:
 		maybe_set (_dcp_j2k_comment, c);
 	}
 
-	void set_default_j2k_bandwidth (int b) {
-		maybe_set (_default_j2k_bandwidth, b);
+	void set_default_video_bit_rate(int64_t b) {
+		maybe_set(_default_video_bit_rate, b);
 	}
 
 	void set_default_audio_delay (int d) {
@@ -933,8 +933,8 @@ public:
 		maybe_set (_check_for_test_updates, c);
 	}
 
-	void set_maximum_j2k_bandwidth (int b) {
-		maybe_set (_maximum_j2k_bandwidth, b);
+	void set_maximum_video_bit_rate(int64_t b) {
+		maybe_set(_maximum_video_bit_rate, b);
 	}
 
 	void set_log_types (int t) {
@@ -1380,7 +1380,7 @@ private:
 	std::string _dcp_product_name;
 	std::string _dcp_product_version;
 	std::string _dcp_j2k_comment;
-	int _default_j2k_bandwidth;
+	int64_t _default_video_bit_rate;
 	int _default_audio_delay;
 	bool _default_interop;
 	boost::optional<dcp::LanguageTag> _default_audio_language;
@@ -1417,8 +1417,8 @@ private:
 	/** true to check for updates on startup */
 	bool _check_for_updates;
 	bool _check_for_test_updates;
-	/** maximum allowed J2K bandwidth in bits per second */
-	int _maximum_j2k_bandwidth;
+	/** maximum allowed video bit rate in bits per second */
+	int64_t _maximum_video_bit_rate;
 	int _log_types;
 	bool _analyse_ebur128;
 	bool _automatic_audio_analysis;
diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index cf903e376..b33537974 100644
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -133,7 +133,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 	optional<string> standard_string;
 	int dcp_frame_rate_int = 0;
 	string template_name_string;
-	int j2k_bandwidth_int = 0;
+	int64_t video_bit_rate_int = 0;
 	auto next_frame_type = VideoFrameType::TWO_D;
 	optional<dcp::Channel> channel;
 	optional<float> gain;
@@ -206,7 +206,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 		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);
+		argument_option(i, argc, argv, "",   "--video-bit-rate",   &claimed, &error, &video_bit_rate_int);
 
 		std::function<optional<dcp::Channel> (string)> convert_channel = [](string channel) -> optional<dcp::Channel>{
 			if (channel == "L") {
@@ -272,8 +272,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 		dcp_frame_rate = dcp_frame_rate_int;
 	}
 
-	if (j2k_bandwidth_int) {
-		_j2k_bandwidth = j2k_bandwidth_int * 1000000;
+	if (video_bit_rate_int) {
+		_video_bit_rate = video_bit_rate_int * 1000000;
 	}
 
 	if (dcp_content_type_string) {
@@ -320,8 +320,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 		_name = content[0].path.filename().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));
+	if (_video_bit_rate && (*_video_bit_rate < 10000000 || *_video_bit_rate > Config::instance()->maximum_video_bit_rate())) {
+		error = String::compose("%1: video-bit-rate must be between 10 and %2 Mbit/s", argv[0], (Config::instance()->maximum_video_bit_rate() / 1000000));
 		return;
 	}
 }
@@ -372,8 +372,8 @@ CreateCLI::make_film() const
 	if (_fourk) {
 		film->set_resolution(Resolution::FOUR_K);
 	}
-	if (_j2k_bandwidth) {
-		film->set_j2k_bandwidth(*_j2k_bandwidth);
+	if (_video_bit_rate) {
+		film->set_video_bit_rate(*_video_bit_rate);
 	}
 
 	int channels = 6;
diff --git a/src/lib/create_cli.h b/src/lib/create_cli.h
index 782aaf974..850cddea9 100644
--- a/src/lib/create_cli.h
+++ b/src/lib/create_cli.h
@@ -72,7 +72,7 @@ private:
 	bool _no_use_isdcf_name = false;
 	bool _twok = false;
 	bool _fourk = false;
-	boost::optional<int> _j2k_bandwidth;
+	boost::optional<int64_t> _video_bit_rate;
 
 	static std::string _help;
 };
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 6580ac448..ec88888dd 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -74,15 +74,15 @@ using namespace boost::placeholders;
 /** Construct a DCP video frame.
  *  @param frame Input frame.
  *  @param index Index of the frame within the DCP.
- *  @param bw J2K bandwidth to use (see Config::j2k_bandwidth ())
+ *  @param bit_rate Video bit rate to use.
  */
 DCPVideo::DCPVideo (
-	shared_ptr<const PlayerVideo> frame, int index, int dcp_fps, int bw, Resolution r
+	shared_ptr<const PlayerVideo> frame, int index, int dcp_fps, int64_t bit_rate, Resolution r
 	)
 	: _frame (frame)
 	, _index (index)
 	, _frames_per_second (dcp_fps)
-	, _j2k_bandwidth (bw)
+	, _video_bit_rate(bit_rate)
 	, _resolution (r)
 {
 
@@ -93,7 +93,7 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::
 {
 	_index = node->number_child<int> ("Index");
 	_frames_per_second = node->number_child<int> ("FramesPerSecond");
-	_j2k_bandwidth = node->number_child<int> ("J2KBandwidth");
+	_video_bit_rate = node->number_child<int64_t>("VideoBitRate");
 	_resolution = Resolution (node->optional_number_child<int>("Resolution").get_value_or(static_cast<int>(Resolution::TWO_K)));
 }
 
@@ -160,7 +160,7 @@ DCPVideo::encode_locally () const
 	while (true) {
 		enc = dcp::compress_j2k (
 			xyz,
-			_j2k_bandwidth,
+			_video_bit_rate,
 			_frames_per_second,
 			_frame->eyes() == Eyes::LEFT || _frame->eyes() == Eyes::RIGHT,
 			_resolution == Resolution::FOUR_K,
@@ -280,7 +280,7 @@ DCPVideo::add_metadata (xmlpp::Element* el) const
 {
 	cxml::add_text_child(el, "Index", raw_convert<string>(_index));
 	cxml::add_text_child(el, "FramesPerSecond", raw_convert<string>(_frames_per_second));
-	cxml::add_text_child(el, "J2KBandwidth", raw_convert<string>(_j2k_bandwidth));
+	cxml::add_text_child(el, "VideoBitRate", raw_convert<string>(_video_bit_rate));
 	cxml::add_text_child(el, "Resolution", raw_convert<string>(int(_resolution)));
 	_frame->add_metadata (el);
 }
@@ -298,7 +298,7 @@ bool
 DCPVideo::same (shared_ptr<const DCPVideo> other) const
 {
 	if (_frames_per_second != other->_frames_per_second ||
-	    _j2k_bandwidth != other->_j2k_bandwidth ||
+	    _video_bit_rate != other->_video_bit_rate ||
 	    _resolution != other->_resolution) {
 		return false;
 	}
diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index d07c8322b..92c155f0c 100644
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -49,7 +49,7 @@ class PlayerVideo;
 class DCPVideo
 {
 public:
-	DCPVideo (std::shared_ptr<const PlayerVideo>, int index, int dcp_fps, int bandwidth, Resolution r);
+	DCPVideo(std::shared_ptr<const PlayerVideo>, int index, int dcp_fps, int64_t bit_rate, Resolution r);
 	DCPVideo (std::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr);
 
 	DCPVideo (DCPVideo const&) = default;
@@ -78,7 +78,7 @@ private:
 	std::shared_ptr<const PlayerVideo> _frame;
 	int _index;			 ///< frame index within the DCP's intrinsic duration
 	int _frames_per_second;		 ///< Frames per second that we will use for the DCP
-	int _j2k_bandwidth;		 ///< J2K bandwidth to use
+	int64_t _video_bit_rate;	 ///< Video bit rate to use
 	Resolution _resolution;          ///< Resolution (2K or 4K)
 };
 
diff --git a/src/lib/film.cc b/src/lib/film.cc
index fd703a72a..3de536a6d 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -163,7 +163,7 @@ Film::Film (optional<boost::filesystem::path> dir)
 	, _resolution (Resolution::TWO_K)
 	, _encrypted (false)
 	, _context_id (dcp::make_uuid ())
-	, _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ())
+	, _video_bit_rate(Config::instance()->default_video_bit_rate())
 	, _video_frame_rate (24)
 	, _audio_channels (Config::instance()->default_dcp_audio_channels ())
 	, _three_d (false)
@@ -240,7 +240,7 @@ Film::video_identifier () const
 		+ "_" + resolution_to_string (_resolution)
 		+ "_" + _playlist->video_identifier()
 		+ "_" + raw_convert<string>(_video_frame_rate)
-		+ "_" + raw_convert<string>(j2k_bandwidth());
+		+ "_" + raw_convert<string>(video_bit_rate());
 
 	if (encrypted ()) {
 		/* This is insecure but hey, the key is in plaintext in metadata.xml */
@@ -397,7 +397,7 @@ Film::metadata (bool with_content_paths) const
 	}
 
 	cxml::add_text_child(root, "Resolution", resolution_to_string(_resolution));
-	cxml::add_text_child(root, "J2KBandwidth", raw_convert<string>(_j2k_bandwidth));
+	cxml::add_text_child(root, "VideoBitRate", raw_convert<string>(_video_bit_rate));
 	cxml::add_text_child(root, "VideoFrameRate", raw_convert<string>(_video_frame_rate));
 	cxml::add_text_child(root, "AudioFrameRate", raw_convert<string>(_audio_frame_rate));
 	cxml::add_text_child(root, "ISDCFDate", boost::gregorian::to_iso_string(_isdcf_date));
@@ -569,7 +569,11 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 	}
 
 	_resolution = string_to_resolution (f.string_child ("Resolution"));
-	_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
+	if (auto j2k = f.optional_number_child<int>("J2KBandwidth")) {
+		_video_bit_rate = *j2k;
+	} else {
+		_video_bit_rate = f.number_child<int64_t>("VideoBitRate");
+	}
 	_video_frame_rate = f.number_child<int> ("VideoFrameRate");
 	_audio_frame_rate = f.optional_number_child<int>("AudioFrameRate").get_value_or(48000);
 	_encrypted = f.bool_child ("Encrypted");
@@ -1169,10 +1173,10 @@ Film::set_resolution (Resolution r, bool explicit_user)
 
 
 void
-Film::set_j2k_bandwidth (int b)
+Film::set_video_bit_rate(int64_t bit_rate)
 {
-	FilmChangeSignaller ch(this, FilmProperty::J2K_BANDWIDTH);
-	_j2k_bandwidth = b;
+	FilmChangeSignaller ch(this, FilmProperty::VIDEO_BIT_RATE);
+	_video_bit_rate = bit_rate;
 }
 
 /** @param f New frame rate.
@@ -1765,7 +1769,7 @@ Film::make_kdm(boost::filesystem::path cpl_file, dcp::LocalTime from, dcp::Local
 uint64_t
 Film::required_disk_space () const
 {
-	return _playlist->required_disk_space (shared_from_this(), j2k_bandwidth(), audio_channels(), audio_frame_rate());
+	return _playlist->required_disk_space (shared_from_this(), video_bit_rate(), audio_channels(), audio_frame_rate());
 }
 
 /** This method checks the disk that the Film is on and tries to decide whether or not
@@ -1897,7 +1901,7 @@ Film::reels () const
 		/* Integer-divide reel length by the size of one frame to give the number of frames per reel,
 		 * making sure we don't go less than 1s long.
 		 */
-		Frame const reel_in_frames = max(_reel_length / ((j2k_bandwidth() / video_frame_rate()) / 8), static_cast<Frame>(video_frame_rate()));
+		Frame const reel_in_frames = max(_reel_length / ((video_bit_rate() / video_frame_rate()) / 8), static_cast<Frame>(video_frame_rate()));
 		while (current < len) {
 			DCPTime end = min (len, current + DCPTime::from_frames (reel_in_frames, video_frame_rate ()));
 			periods.emplace_back(current, end);
@@ -1941,7 +1945,7 @@ Film::use_template (string name)
 	_dcp_content_type = _template_film->_dcp_content_type;
 	_container = _template_film->_container;
 	_resolution = _template_film->_resolution;
-	_j2k_bandwidth = _template_film->_j2k_bandwidth;
+	_video_bit_rate = _template_film->_video_bit_rate;
 	_video_frame_rate = _template_film->_video_frame_rate;
 	_encrypted = _template_film->_encrypted;
 	_audio_channels = _template_film->_audio_channels;
diff --git a/src/lib/film.h b/src/lib/film.h
index 0a0c5a4e1..392f1dc5e 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -250,8 +250,8 @@ public:
 		return _key;
 	}
 
-	int j2k_bandwidth () const {
-		return _j2k_bandwidth;
+	int video_bit_rate() const {
+		return _video_bit_rate;
 	}
 
 	/** @return The frame rate of the DCP */
@@ -401,7 +401,7 @@ public:
 	void set_container (Ratio const *, bool user_explicit = true);
 	void set_resolution (Resolution, bool user_explicit = true);
 	void set_encrypted (bool);
-	void set_j2k_bandwidth (int);
+	void set_video_bit_rate(int64_t);
 	void set_video_frame_rate (int rate, bool user_explicit = false);
 	void set_audio_channels (int);
 	void set_three_d (bool);
@@ -515,8 +515,8 @@ private:
 	 *  re-start picture MXF encodes.
 	 */
 	std::string _context_id;
-	/** bandwidth for J2K files in bits per second */
-	int _j2k_bandwidth;
+	/** bit rate for encoding video using J2K or MPEG2 in bits per second */
+	int64_t _video_bit_rate;
 	/** Frames per second to run our DCP at */
 	int _video_frame_rate;
 	/** The date that we should use in a ISDCF name */
diff --git a/src/lib/film_property.h b/src/lib/film_property.h
index 0841caa5c..b755a4887 100644
--- a/src/lib/film_property.h
+++ b/src/lib/film_property.h
@@ -39,7 +39,7 @@ enum class FilmProperty {
 	CONTAINER,
 	RESOLUTION,
 	ENCRYPTED,
-	J2K_BANDWIDTH,
+	VIDEO_BIT_RATE,
 	VIDEO_FRAME_RATE,
 	AUDIO_FRAME_RATE,
 	AUDIO_CHANNELS,
diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h
index 521faae8d..fc9b74a57 100644
--- a/src/lib/grok/context.h
+++ b/src/lib/grok/context.h
@@ -226,7 +226,7 @@ public:
 					device,
 					_dcpomatic_context->film->resolution() == Resolution::FOUR_K,
 					_dcpomatic_context->film->video_frame_rate(),
-					_dcpomatic_context->film->j2k_bandwidth(),
+					_dcpomatic_context->film->video_bit_rate(),
 					grok.licence_server,
 					grok.licence_port,
 					grok.licence)) {
diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 7a6a2a4bf..fc59fa703 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -173,10 +173,10 @@ Hints::check_unusual_container ()
 
 
 void
-Hints::check_high_j2k_bandwidth ()
+Hints::check_high_video_bit_rate()
 {
-	if (film()->j2k_bandwidth() >= 245000000) {
-		hint (_("A few projectors have problems playing back very high bit-rate DCPs.  It is a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is unlikely to have any visible effect on the image."));
+	if (film()->video_bit_rate() >= 245000000) {
+		hint (_("A few projectors have problems playing back very high bit-rate DCPs.  It is a good idea to drop the video bit rate down to about 200Mbit/s; this is unlikely to have any visible effect on the image."));
 	}
 }
 
@@ -468,7 +468,7 @@ try
 	check_upmixers ();
 	check_incorrect_container ();
 	check_unusual_container ();
-	check_high_j2k_bandwidth ();
+	check_high_video_bit_rate();
 	check_frame_rate ();
 	check_4k_3d ();
 	check_speed_up ();
diff --git a/src/lib/hints.h b/src/lib/hints.h
index e7a6646ef..a46678af8 100644
--- a/src/lib/hints.h
+++ b/src/lib/hints.h
@@ -74,7 +74,7 @@ private:
 	void check_upmixers ();
 	void check_incorrect_container ();
 	void check_unusual_container ();
-	void check_high_j2k_bandwidth ();
+	void check_high_video_bit_rate();
 	void check_frame_rate ();
 	void check_4k_3d ();
 	void check_speed_up ();
diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index 6154dfb62..d5c7b3eed 100644
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -310,7 +310,7 @@ J2KEncoder::encode (shared_ptr<PlayerVideo> pv, DCPTime time)
 				pv,
 				position,
 				_film->video_frame_rate(),
-				_film->j2k_bandwidth(),
+				_film->video_bit_rate(),
 				_film->resolution()
 				);
 		_queue.push_back (dcpv);
diff --git a/src/lib/make_dcp.cc b/src/lib/make_dcp.cc
index 41c5e8ec5..e4707721c 100644
--- a/src/lib/make_dcp.cc
+++ b/src/lib/make_dcp.cc
@@ -91,7 +91,7 @@ make_dcp (shared_ptr<Film> film, TranscodeJob::ChangedBehaviour behaviour)
 		LOG_GENERAL ("Content: %1", content->technical_summary());
 	}
 	LOG_GENERAL ("DCP video rate %1 fps", film->video_frame_rate());
-	LOG_GENERAL ("J2K bandwidth %1", film->j2k_bandwidth());
+	LOG_GENERAL("Video bit rate %1", film->video_bit_rate());
 
 	auto tj = make_shared<DCPTranscodeJob>(film, behaviour);
 	tj->set_encoder(make_shared<DCPFilmEncoder>(film, tj));
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 7f83e9474..d2af000e5 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -645,16 +645,16 @@ Playlist::move_later (shared_ptr<const Film> film, shared_ptr<Content> c)
 
 
 int64_t
-Playlist::required_disk_space (shared_ptr<const Film> film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const
+Playlist::required_disk_space(shared_ptr<const Film> film, int64_t video_bit_rate, int audio_channels, int audio_frame_rate) const
 {
-	int64_t video = uint64_t(j2k_bandwidth / 8) * length(film).seconds();
+	int64_t video = uint64_t(video_bit_rate / 8) * length(film).seconds();
 	int64_t audio = uint64_t(audio_channels) * audio_frame_rate * 3 * length(film).seconds();
 
 	for (auto i: content()) {
 		auto d = dynamic_pointer_cast<DCPContent> (i);
 		if (d) {
 			if (d->reference_video()) {
-				video -= uint64_t (j2k_bandwidth / 8) * d->length_after_trim(film).seconds();
+				video -= uint64_t(video_bit_rate / 8) * d->length_after_trim(film).seconds();
 			}
 			if (d->reference_audio()) {
 				audio -= uint64_t(audio_channels) * audio_frame_rate * 3 * d->length_after_trim(film).seconds();
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 7b9bd19fa..3868c0b51 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -65,7 +65,7 @@ public:
 
 	dcpomatic::DCPTime length (std::shared_ptr<const Film> film) const;
 	boost::optional<dcpomatic::DCPTime> start () const;
-	int64_t required_disk_space (std::shared_ptr<const Film> film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const;
+	int64_t required_disk_space(std::shared_ptr<const Film> film, int64_t video_bit_rate, int audio_channels, int audio_frame_rate) const;
 
 	int best_video_frame_rate () const;
 	dcpomatic::DCPTime video_end (std::shared_ptr<const Film> film) const;