More DCP verification bits.

diff --git a/src/dcp.h b/src/dcp.h
index 811f62f636dd459402c4c4d441cea0e4d0c45737..752bd814ceeb56f4d38eab8392e61bc23f59fbb3 100644 (file)
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -124,6 +124,10 @@ public:
                return _standard;
        }
 
+       boost::filesystem::path directory () const {
+               return _directory;
+       }
+
        static std::vector<boost::filesystem::path> directories_from_files (std::vector<boost::filesystem::path> files);
 
 private:

diff --git a/src/verify.cc b/src/verify.cc
index 8f850e83bd1595b1eb6ef07da79b01792a511005..75cab01df092a231157098d2506bad68a57bdee4 100644 (file)
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -33,19 +33,37 @@
 
 #include "verify.h"
 #include "dcp.h"
+#include "cpl.h"
+#include "reel.h"
+#include "reel_picture_asset.h"
+#include "reel_sound_asset.h"
 #include "exceptions.h"
 #include <boost/foreach.hpp>
 #include <list>
 #include <vector>
+#include <iostream>
 
 using std::list;
 using std::vector;
+using std::string;
+using std::cout;
 using boost::shared_ptr;
+using boost::optional;
+using boost::function;
 
 using namespace dcp;
 
+static bool
+verify_asset (shared_ptr<ReelAsset> 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;
+}
+
 list<VerificationNote>
-dcp::verify (vector<boost::filesystem::path> directories)
+dcp::verify (vector<boost::filesystem::path> directories, function<void (string, optional<boost::filesystem::path>)> stage, function<void (float)> progress)
 {
        list<VerificationNote> notes;
 
@@ -54,15 +72,39 @@ dcp::verify (vector<boost::filesystem::path> directories)
                dcps.push_back (shared_ptr<DCP> (new DCP (i)));
        }
 
-       BOOST_FOREACH (shared_ptr<DCP> i, dcps) {
+       BOOST_FOREACH (shared_ptr<DCP> dcp, dcps) {
+               stage ("Checking DCP", dcp->directory());
                DCP::ReadErrors errors;
                try {
-                       i->read (true, &errors);
+                       dcp->read (true, &errors);
                } catch (DCPReadError& e) {
                        notes.push_back (VerificationNote (VerificationNote::VERIFY_ERROR, e.what ()));
                } catch (XMLError& e) {
                        notes.push_back (VerificationNote (VerificationNote::VERIFY_ERROR, e.what ()));
                }
+
+               BOOST_FOREACH (shared_ptr<CPL> cpl, dcp->cpls()) {
+                       stage ("Checking CPL", cpl->file());
+                       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"));
+                                       } else {
+                                               cout << "pic ok.\n";
+                                       }
+                               }
+                               if (reel->main_sound()) {
+                                       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"));
+                                       } else {
+                                               cout << "sounds ok.\n";
+                                       }
+                               }
+                       }
+               }
        }
 
        return notes;

diff --git a/src/verify.h b/src/verify.h
index 3538722e49668b1121caa372512815213142afe8..f5b21763eb4de1310e5ee066c517d4893a82d207 100644 (file)
--- a/src/verify.h
+++ b/src/verify.h
@@ -35,6 +35,8 @@
 #define LIBDCP_VERIFY_H
 
 #include <boost/filesystem.hpp>
+#include <boost/function.hpp>
+#include <boost/optional.hpp>
 #include <string>
 #include <list>
 #include <vector>
@@ -71,7 +73,11 @@ private:
        std::string _note;
 };
 
-std::list<VerificationNote> verify (std::vector<boost::filesystem::path> directories);
+std::list<VerificationNote> verify (
+       std::vector<boost::filesystem::path> directories,
+       boost::function<void (std::string, boost::optional<boost::filesystem::path>)> stage,
+       boost::function<void (float)> progress
+       );
 
 }
 

diff --git a/test/verify_test.cc b/test/verify_test.cc
new file mode 100644 (file)
index 0000000..6a15f89
--- /dev/null
+++ b/test/verify_test.cc
@@ -0,0 +1,113 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    libdcp is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
+*/
+
+#include "verify.h"
+#include <boost/test/unit_test.hpp>
+
+using std::list;
+using std::pair;
+using std::string;
+using std::vector;
+using std::make_pair;
+using boost::optional;
+
+static list<pair<string, optional<boost::filesystem::path> > > stages;
+
+static void
+stage (string s, optional<boost::filesystem::path> p)
+{
+       stages.push_back (make_pair (s, p));
+}
+
+static void
+progress (float)
+{
+
+}
+
+BOOST_AUTO_TEST_CASE (verify_test1)
+{
+       boost::filesystem::remove_all ("build/test/verify_test1");
+       boost::filesystem::create_directory ("build/test/verify_test1");
+       for (boost::filesystem::directory_iterator i("test/ref/DCP/dcp_test1"); i != boost::filesystem::directory_iterator(); ++i) {
+               boost::filesystem::copy (i->path(), "build/test/verify_test1" / i->path().filename());
+       }
+
+       vector<boost::filesystem::path> directories;
+       directories.push_back ("build/test/verify_test1");
+       list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress);
+
+       list<pair<string, optional<boost::filesystem::path> > >::const_iterator st = stages.begin();
+       BOOST_CHECK_EQUAL (st->first, "Checking DCP");
+       BOOST_REQUIRE (st->second);
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1"));
+       ++st;
+       BOOST_CHECK_EQUAL (st->first, "Checking CPL");
+       BOOST_REQUIRE (st->second);
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml"));
+       ++st;
+       BOOST_CHECK_EQUAL (st->first, "Checking reel");
+       BOOST_REQUIRE (!st->second);
+       ++st;
+       BOOST_CHECK_EQUAL (st->first, "Checking picture asset hash");
+       BOOST_REQUIRE (st->second);
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/video.mxf"));
+       ++st;
+       BOOST_CHECK_EQUAL (st->first, "Checking sound asset hash");
+       BOOST_REQUIRE (st->second);
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/audio.mxf"));
+       ++st;
+       BOOST_REQUIRE (st == stages.end());
+
+       BOOST_CHECK_EQUAL (notes.size(), 0);
+
+       FILE* mod = fopen("build/test/verify_test1/video.mxf", "r+b");
+       BOOST_REQUIRE (mod);
+       fseek (mod, 4096, SEEK_SET);
+       int x = 42;
+       fwrite (&x, sizeof(x), 1, mod);
+       fclose (mod);
+
+       mod = fopen("build/test/verify_test1/audio.mxf", "r+b");
+       BOOST_REQUIRE (mod);
+       fseek (mod, 4096, SEEK_SET);
+       BOOST_REQUIRE (fwrite (&x, sizeof(x), 1, mod) == 1);
+       fclose (mod);
+
+       notes = dcp::verify (directories, &stage, &progress);
+       BOOST_CHECK_EQUAL (notes.size(), 2);
+       BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR);
+       BOOST_CHECK_EQUAL (notes.front().note(), "Picture asset hash is incorrect");
+       BOOST_CHECK_EQUAL (notes.back().type(), dcp::VerificationNote::VERIFY_ERROR);
+       BOOST_CHECK_EQUAL (notes.back().note(), "Sound asset hash is incorrect");
+}

diff --git a/test/wscript b/test/wscript
index a11dc2a7a03608e18009e2b044bda34dd941683a..5838df68bdeb88b6df2203eb2d0dada716ddb468 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -96,6 +96,7 @@ def build(bld):
                  util_test.cc
                  utf8_test.cc
                  write_subtitle_test.cc
+                 verify_test.cc
                  """
     obj.target = 'tests'
     obj.install_path = ''