summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-10-28 23:04:15 +0200
committerCarl Hetherington <cth@carlh.net>2023-10-28 23:04:15 +0200
commit641a2ce2f72f451c73b1120b5a1301dd4c05c983 (patch)
treea073fb3503cb51f0b23f48d73d681b6b78bb8536
parentb4623c613ed26789f991391c27f4b14055480c08 (diff)
Fix some possible overflows.
-rw-r--r--src/lib/playlist.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 2f261d8a0..7f8292c7f 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -647,8 +647,8 @@ 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
{
- int64_t video = uint64_t (j2k_bandwidth / 8) * length(film).seconds();
- int64_t audio = uint64_t (audio_channels * audio_frame_rate * 3) * length(film).seconds();
+ int64_t video = uint64_t(j2k_bandwidth / 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);
@@ -657,7 +657,7 @@ Playlist::required_disk_space (shared_ptr<const Film> film, int j2k_bandwidth, i
video -= uint64_t (j2k_bandwidth / 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();
+ audio -= uint64_t(audio_channels) * audio_frame_rate * 3 * d->length_after_trim(film).seconds();
}
}
}