summaryrefslogtreecommitdiff
path: root/src/lib/dcp_examiner.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-05-29 21:12:17 +0200
committerCarl Hetherington <cth@carlh.net>2024-05-29 21:12:17 +0200
commit07aa4852acfd908c4e3a92f7bed2c7328cfcf123 (patch)
treebe9642b5202a0342be268f6e4b9f93c684bab347 /src/lib/dcp_examiner.cc
parentbfac1d7cfec57b225a0257d2fa0172efe7fbd08b (diff)
parent78dc1250feed93df7f519c559949d4fac4cc5b1a (diff)
Merge remote-tracking branch 'origin/main' into v2.17.x
Diffstat (limited to 'src/lib/dcp_examiner.cc')
-rw-r--r--src/lib/dcp_examiner.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 229786868..ae885c140 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -173,7 +173,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
if (reel->main_sound()) {
_has_audio = true;
- _audio_length += reel->main_sound()->actual_duration();
+ auto const edit_rate = reel->main_sound()->edit_rate();
if (!reel->main_sound()->asset_ref().resolved()) {
LOG_GENERAL("Main sound %1 of reel %2 is missing", reel->main_sound()->id(), reel->id());
@@ -198,6 +198,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
}
_audio_language = try_to_parse_language (asset->language());
+ _audio_length += reel->main_sound()->actual_duration() * (asset->sampling_rate() * edit_rate.denominator / edit_rate.numerator);
}
}