summaryrefslogtreecommitdiff
path: root/src/verify.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/verify.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/verify.cc')
-rw-r--r--src/verify.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/verify.cc b/src/verify.cc
index c9d9b24d..7948767a 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1131,7 +1131,7 @@ dcp::verify (
stage ("Checking DCP", dcp->directory());
bool carry_on = true;
try {
- dcp->read (&notes);
+ dcp->read (&notes, true);
} catch (MissingAssetmapError& e) {
notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::FAILED_READ, string(e.what())});
carry_on = false;
@@ -1472,6 +1472,8 @@ dcp::note_to_string (VerificationNote note)
return String::compose("The instantaneous bit rate of the picture asset %1 is close to the limit of 250Mbit/s in at least one place.", note.file()->filename());
case VerificationNote::Code::EXTERNAL_ASSET:
return String::compose("The asset %1 that this DCP refers to is not included in the DCP. It may be a VF.", note.note().get());
+ case VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD:
+ return String::compose("The asset %1 is 3D but its MXF is marked as 2D.", note.file()->filename());
case VerificationNote::Code::INVALID_STANDARD:
return "This DCP does not use the SMPTE standard.";
case VerificationNote::Code::INVALID_LANGUAGE: