Fix erroneous reports of unresolved assets when checking OV/VF pairs.

[libdcp.git] / src / verify.cc

diff --git a/src/verify.cc b/src/verify.cc
index 87958ed9b6daebb50efd9d94aff3220079288003..0445a854e7a513df61654f2c98e8cd7e6b0eb65a 100644 (file)
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -38,6 +38,7 @@
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "exceptions.h"
+#include "compose.hpp"
 #include <boost/foreach.hpp>
 #include <list>
 #include <vector>
@@ -53,13 +54,43 @@ using boost::function;
 
 using namespace dcp;
 
-static bool
-verify_asset (shared_ptr<ReelAsset> asset, function<void (float)> progress)
+enum Result {
+       RESULT_GOOD,
+       RESULT_CPL_PKL_DIFFER,
+       RESULT_BAD
+};
+
+static Result
+verify_asset (shared_ptr<DCP> dcp, shared_ptr<ReelAsset> reel_asset, function<void (float)> progress)
 {
-       string actual_hash = asset->asset_ref()->hash(progress);
-       optional<string> cpl_hash = asset->hash();
-       DCP_ASSERT (cpl_hash);
-       return actual_hash != *cpl_hash;
+       string const actual_hash = reel_asset->asset_ref()->hash(progress);
+
+       list<shared_ptr<PKL> > pkls = dcp->pkls();
+       /* We've read this DCP in so it must have at least one PKL */
+       DCP_ASSERT (!pkls.empty());
+
+       shared_ptr<Asset> asset = reel_asset->asset_ref().asset();
+
+       optional<string> pkl_hash;
+       BOOST_FOREACH (shared_ptr<PKL> i, pkls) {
+               pkl_hash = i->hash (reel_asset->asset_ref()->id());
+               if (pkl_hash) {
+                       break;
+               }
+       }
+
+       DCP_ASSERT (pkl_hash);
+
+       optional<string> cpl_hash = reel_asset->hash();
+       if (cpl_hash && *cpl_hash != *pkl_hash) {
+               return RESULT_CPL_PKL_DIFFER;
+       }
+
+       if (actual_hash != *pkl_hash) {
+               return RESULT_BAD;
+       }
+
+       return RESULT_GOOD;
 }
 
 list<VerificationNote>
@@ -78,25 +109,72 @@ dcp::verify (vector<boost::filesystem::path> directories, function<void (string,
                try {
                        dcp->read (true, &errors);
                } catch (DCPReadError& e) {
-                       notes.push_back (VerificationNote (VerificationNote::VERIFY_ERROR, e.what ()));
+                       notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::GENERAL_READ, string(e.what())));
                } catch (XMLError& e) {
-                       notes.push_back (VerificationNote (VerificationNote::VERIFY_ERROR, e.what ()));
+                       notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::GENERAL_READ, string(e.what())));
                }
 
                BOOST_FOREACH (shared_ptr<CPL> cpl, dcp->cpls()) {
                        stage ("Checking CPL", cpl->file());
+
+                       /* Check that the CPL's hash corresponds to the PKL */
+                       BOOST_FOREACH (shared_ptr<PKL> i, dcp->pkls()) {
+                               optional<string> h = i->hash(cpl->id());
+                               if (h && make_digest(Data(*cpl->file())) != *h) {
+                                       notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::CPL_HASH_INCORRECT));
+                               }
+                       }
+
                        BOOST_FOREACH (shared_ptr<Reel> reel, cpl->reels()) {
                                stage ("Checking reel", optional<boost::filesystem::path>());
                                if (reel->main_picture()) {
-                                       stage ("Checking picture asset hash", reel->main_picture()->asset()->file());
-                                       if (verify_asset (reel->main_picture(), progress)) {
-                                               notes.push_back (VerificationNote (VerificationNote::VERIFY_ERROR, "Picture asset hash is incorrect."));
+                                       /* Check reel stuff */
+                                       Fraction const frame_rate = reel->main_picture()->frame_rate();
+                                       if (frame_rate.denominator != 1 ||
+                                           (frame_rate.numerator != 24 &&
+                                            frame_rate.numerator != 25 &&
+                                            frame_rate.numerator != 30 &&
+                                            frame_rate.numerator != 48 &&
+                                            frame_rate.numerator != 50 &&
+                                            frame_rate.numerator != 60)) {
+                                               notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::INVALID_PICTURE_FRAME_RATE));
+                                       }
+                                       /* Check asset */
+                                       if (reel->main_picture()->asset_ref().resolved()) {
+                                               stage ("Checking picture asset hash", reel->main_picture()->asset()->file());
+                                               Result const r = verify_asset (dcp, reel->main_picture(), progress);
+                                               switch (r) {
+                                               case RESULT_BAD:
+                                                       notes.push_back (
+                                                               VerificationNote(
+                                                                       VerificationNote::VERIFY_ERROR, VerificationNote::PICTURE_HASH_INCORRECT, *reel->main_picture()->asset()->file()
+                                                                       )
+                                                               );
+                                                       break;
+                                               case RESULT_CPL_PKL_DIFFER:
+                                                       notes.push_back (VerificationNote(VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE));
+                                                       break;
+                                               default:
+                                                       break;
+                                               }
                                        }
                                }
-                               if (reel->main_sound()) {
+                               if (reel->main_sound() && reel->main_sound()->asset_ref().resolved()) {
                                        stage ("Checking sound asset hash", reel->main_sound()->asset()->file());
-                                       if (verify_asset (reel->main_sound(), progress)) {
-                                               notes.push_back (VerificationNote (VerificationNote::VERIFY_ERROR, "Sound asset hash is incorrect."));
+                                       Result const r = verify_asset (dcp, reel->main_sound(), progress);
+                                       switch (r) {
+                                       case RESULT_BAD:
+                                               notes.push_back (
+                                                       VerificationNote(
+                                                               VerificationNote::VERIFY_ERROR, VerificationNote::SOUND_HASH_INCORRECT, *reel->main_sound()->asset()->file()
+                                                               )
+                                                       );
+                                               break;
+                                       case RESULT_CPL_PKL_DIFFER:
+                                               notes.push_back (VerificationNote (VerificationNote::VERIFY_ERROR, VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE));
+                                               break;
+                                       default:
+                                               break;
                                        }
                                }
                        }