From 4678bf06d71c8a18c489912dabf8aca312ab8b6b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 31 Jul 2012 00:32:58 +0100 Subject: Barely-functional dcpdiff. --- src/dcp.cc | 27 +++++++++++++++++++++++++++ src/dcp.h | 2 ++ src/types.h | 4 ++++ tools/dcpdiff.cc | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 2 deletions(-) diff --git a/src/dcp.cc b/src/dcp.cc index 8f7a73bc..dc895e11 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -304,3 +304,30 @@ DCP::DCP (string directory) } } +list +DCP::equals (DCP const & other, EqualityType type) const +{ + list notes; + + switch (type) { + case LIBDCP_METADATA: + if (_name != other._name) { + notes.push_back ("names differ"); + } + if (_content_kind != other._content_kind) { + notes.push_back ("content kinds differ"); + } + if (_fps != other._fps) { + notes.push_back ("frames per second differ"); + } + if (_length != other._length) { + notes.push_back ("lengths differ"); + } + if (_assets.size() != other._assets.size()) { + notes.push_back ("asset counts differ"); + } + break; + } + + return notes; +} diff --git a/src/dcp.h b/src/dcp.h index 900a5665..6ab57bcb 100644 --- a/src/dcp.h +++ b/src/dcp.h @@ -106,6 +106,8 @@ public: return _length; } + std::list equals (DCP const & other, EqualityType type) const; + /** Emitted with a parameter between 0 and 1 to indicate progress * for long jobs. */ diff --git a/src/types.h b/src/types.h index b8f7805a..5cd76ff4 100644 --- a/src/types.h +++ b/src/types.h @@ -62,6 +62,10 @@ public: int denominator; }; +enum EqualityType { + LIBDCP_METADATA +}; + } #endif diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc index b503ee1a..840a1b3e 100644 --- a/tools/dcpdiff.cc +++ b/tools/dcpdiff.cc @@ -1,10 +1,63 @@ +#include #include "dcp.h" +using namespace std; using namespace libdcp; +static void +help (string n) +{ + cerr << "Syntax: " << n << " [OPTION] \n" + << " -v, --version show DVD-o-matic version\n" + << " -h, --help show this help\n" + << "\n" + << "The s are the DCP directories to compare.\n"; +} + int main (int argc, char* argv[]) { - DCP dcp ("/home/carl/src/dvdomatic-test/reference/dolby_aurora.vob/dolby_aurora.vob"); - return 0; + int option_index = 0; + while (1) { + static struct option long_options[] = { + { "version", no_argument, 0, 'v'}, + { "help", no_argument, 0, 'h'}, + { 0, 0, 0, 0 } + }; + + int c = getopt_long (argc, argv, "vh", long_options, &option_index); + + if (c == -1) { + break; + } + + switch (c) { + case 'v': + cout << "dcpdiff version " << LIBDCP_VERSION << "\n"; + exit (EXIT_SUCCESS); + case 'h': + help (argv[0]); + exit (EXIT_SUCCESS); + } + } + + if (argc <= optind || argc > (optind + 2)) { + help (argv[0]); + exit (EXIT_FAILURE); + } + + DCP a (argv[optind]); + DCP b (argv[optind + 1]); + + list notes = a.equals (b, LIBDCP_METADATA); + if (notes.empty ()) { + cout << "DCPs identical by LIBDCP_METADATA\n"; + exit (EXIT_SUCCESS); + } + + for (list::iterator i = notes.begin(); i != notes.end(); ++i) { + cout << " " << *i << "\n"; + } + + exit (EXIT_FAILURE); } -- cgit v1.2.3