Stop reading default video bit rate values from config.xml

We haven't written them back in a long time, and they will only take
effect for those updating from a very old version (and then, only until
the config is re-saved without the tags).

3 files changed, 3 insertions, 17 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index b4c632ae1..03c4bb72d 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -110,8 +110,6 @@ Config::set_defaults()
 	_show_experimental_audio_processors = false;
 	_language = optional<string>();
 	_default_still_length = 10;
-	_default_video_bit_rate[VideoEncoding::JPEG2000] = 150000000;
-	_default_video_bit_rate[VideoEncoding::MPEG2] = 5000000;
 	_default_audio_delay = 0;
 	_player_audio_delay = 0;
 	_default_interop = false;
@@ -375,12 +373,6 @@ 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);
-	if (auto j2k = f.optional_number_child<int>("DefaultJ2KBandwidth")) {
-		_default_video_bit_rate[VideoEncoding::JPEG2000] = *j2k;
-	} else {
-		_default_video_bit_rate[VideoEncoding::JPEG2000] = f.optional_number_child<int64_t>("DefaultJ2KVideoBitRate").get_value_or(200000000);
-	}
-	_default_video_bit_rate[VideoEncoding::MPEG2] = f.optional_number_child<int64_t>("DefaultMPEG2VideoBitRate").get_value_or(5000000);
 	_default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or(0);
 	_player_audio_delay = f.optional_number_child<int>("PlayerAudioDelay").get_value_or(0);
 	_default_interop = f.optional_bool_child("DefaultInterop").get_value_or(false);
diff --git a/src/lib/config.h b/src/lib/config.h
index 582e90cf9..abe97d2d4 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -238,10 +238,6 @@ public:
 		return _dcp_j2k_comment;
 	}
 
-	int64_t default_video_bit_rate(VideoEncoding encoding) const {
-		return _default_video_bit_rate[encoding];
-	}
-
 	int default_audio_delay() const {
 		return _default_audio_delay;
 	}
@@ -1397,7 +1393,6 @@ private:
 	std::string _dcp_product_name;
 	std::string _dcp_product_version;
 	std::string _dcp_j2k_comment;
-	EnumIndexedVector<int64_t, VideoEncoding> _default_video_bit_rate;
 	/** Default audio delay in ms */
 	int _default_audio_delay;
 	/** Delay for audio (with respect to picture) in the player, in ms.
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 8a88fc2c5..fbeca53fa 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -211,9 +211,8 @@ Film::Film(optional<boost::filesystem::path> dir)
 		_studio = metadata["studio"];
 	}
 
-	for (auto encoding: {VideoEncoding::JPEG2000, VideoEncoding::MPEG2}) {
-		_video_bit_rate[encoding] = Config::instance()->default_video_bit_rate(encoding);
-	}
+	_video_bit_rate[VideoEncoding::JPEG2000] = std::min(150000000L, Config::instance()->maximum_video_bit_rate(VideoEncoding::JPEG2000));
+	_video_bit_rate[VideoEncoding::MPEG2] = std::min(5000000L, Config::instance()->maximum_video_bit_rate(VideoEncoding::MPEG2));
 
 	_playlist_change_connection = _playlist->Change.connect(bind(&Film::playlist_change, this, _1));
 	_playlist_order_changed_connection = _playlist->OrderChange.connect(bind(&Film::playlist_order_changed, this));
@@ -598,7 +597,7 @@ Film::read_metadata(optional<boost::filesystem::path> path)
 	} else {
 		_video_bit_rate[VideoEncoding::JPEG2000] = f.number_child<int64_t>("J2KVideoBitRate");
 	}
-	_video_bit_rate[VideoEncoding::MPEG2] = f.optional_number_child<int64_t>("MPEG2VideoBitRate").get_value_or(Config::instance()->default_video_bit_rate(VideoEncoding::MPEG2));
+	_video_bit_rate[VideoEncoding::MPEG2] = f.optional_number_child<int64_t>("MPEG2VideoBitRate").get_value_or(5000000);
 	_video_frame_rate = f.number_child<int>("VideoFrameRate");
 	_audio_frame_rate = f.optional_number_child<int>("AudioFrameRate").get_value_or(48000);
 	auto encrypted = f.optional_bool_child("Encrypted").get_value_or(false);