summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-11-19 23:57:27 +0100
committerCarl Hetherington <cth@carlh.net>2023-11-20 12:19:03 +0100
commitf7334e538f39aadf3bab42244c26124a995234f7 (patch)
tree15e65c7344db9d165d1021e9a7f021985b2c5e60 /src
parentc46f6125c482f2a3361cd33d1e1163927f038e9d (diff)
Allow use of KDMs when verifying DCPs.
Diffstat (limited to 'src')
-rw-r--r--src/verify.cc5
-rw-r--r--src/verify.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/verify.cc b/src/verify.cc
index 9a1c0dcc..960f0438 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1807,6 +1807,7 @@ verify_assetmap(
vector<VerificationNote>
dcp::verify (
vector<boost::filesystem::path> directories,
+ vector<dcp::DecryptedKDM> kdms,
function<void (string, optional<boost::filesystem::path>)> stage,
function<void (float)> progress,
VerificationOptions options,
@@ -1854,6 +1855,10 @@ dcp::verify (
notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_STANDARD});
}
+ for (auto kdm: kdms) {
+ dcp->add(kdm);
+ }
+
for (auto cpl: dcp->cpls()) {
verify_cpl(
dcp,
diff --git a/src/verify.h b/src/verify.h
index fdf2d7ff..f57c8e17 100644
--- a/src/verify.h
+++ b/src/verify.h
@@ -41,6 +41,7 @@
#define LIBDCP_VERIFY_H
+#include "decrypted_kdm.h"
#include <boost/any.hpp>
#include <boost/filesystem.hpp>
#include <boost/function.hpp>
@@ -612,6 +613,7 @@ struct VerificationOptions
std::vector<VerificationNote> verify (
std::vector<boost::filesystem::path> directories,
+ std::vector<dcp::DecryptedKDM> kdms,
boost::function<void (std::string, boost::optional<boost::filesystem::path>)> stage,
boost::function<void (float)> progress,
VerificationOptions options = {},