summaryrefslogtreecommitdiff
path: root/src/dcp.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-22 21:56:38 +0200
committerCarl Hetherington <cth@carlh.net>2021-04-22 21:56:38 +0200
commit5e1ce36be463bfc48663d4697860340649060d01 (patch)
treeb05b203e023a3ec1932f2a73ff4ea9d5dcfd7ffd /src/dcp.cc
parentba27603d5b53231607bc8fe41b201d8811b22b4f (diff)
Don't give an error on verifying Interop DCPs with possibly-incorrectly
marked 3D assets. This also adds a warning into the verification output. I don't know if this is actually a standard violation but they have been seen in the wild made by "reputable" DCP creation software. DoM bug #1976.
Diffstat (limited to 'src/dcp.cc')
-rw-r--r--src/dcp.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/dcp.cc b/src/dcp.cc
index cea79ba4..3316b60e 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -261,7 +261,11 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
*pkl_type == remove_parameters(SMPTESubtitleAsset::static_pkl_type(*_standard))
) {
- other_assets.push_back (asset_factory(path, ignore_incorrect_picture_mxf_type));
+ bool found_threed_marked_as_twod = false;
+ other_assets.push_back (asset_factory(path, ignore_incorrect_picture_mxf_type, &found_threed_marked_as_twod));
+ if (found_threed_marked_as_twod && notes) {
+ notes->push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, path});
+ }
} else if (*pkl_type == remove_parameters(FontAsset::static_pkl_type(*_standard))) {
other_assets.push_back (make_shared<FontAsset>(i.first, path));
} else if (*pkl_type == "image/png") {