diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-02-08 20:55:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-02-08 20:55:42 +0100 |
| commit | 4360e6cb73b4d966a2d9a9aaa377d2f7d5291d8f (patch) | |
| tree | c11a6b684f19a0744d157ae57268efa33128c3ca /src/lib/film.cc | |
| parent | 3ad0c63d1838e227e097ed8538ce893645f0249f (diff) | |
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).
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 7 |
1 files changed, 3 insertions, 4 deletions
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); |