Inspect J2K data in MXFs.

[libdcp.git] / tools / dcpdiff.cc

diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index d1b49d05385332700c1a6c81dd9a2c8490cd3365..21b3ff47d53868a69778da299b83b5efc40b9897 100644 (file)
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -8,15 +8,20 @@ static void
 help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION] <DCP> <DCP>\n"
-            << "  -v, --version      show DVD-o-matic version\n"
+            << "  -b, --bitwise      bitwise check\n"
+            << "  -v, --version      show libdcp version\n"
             << "  -h, --help         show this help\n"
             << "\n"
-            << "The <DCP>s are the DCP directories to compare.\n";
+            << "The <DCP>s are the DCP directories to compare.\n"
+            << "Default is to compare metadata and content ignoring timestamps\n"
+            << "and differing UUIDs.  Pass -b to perform a bitwise comparison.\n";
 }
 
 int
 main (int argc, char* argv[])
 {
+       bool bitwise = false;
+       
        int option_index = 0;
        while (1) {
                static struct option long_options[] = {
@@ -25,13 +30,16 @@ main (int argc, char* argv[])
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "vh", long_options, &option_index);
+               int c = getopt_long (argc, argv, "bvh", long_options, &option_index);
 
                if (c == -1) {
                        break;
                }
 
                switch (c) {
+               case 'b':
+                       bitwise = true;
+                       break;
                case 'v':
                        cout << "dcpdiff version " << LIBDCP_VERSION << "\n";
                        exit (EXIT_SUCCESS);
@@ -49,7 +57,12 @@ main (int argc, char* argv[])
        DCP a (argv[optind]);
        DCP b (argv[optind + 1]);
 
-       list<string> notes = a.equals (b, EqualityFlags (LIBDCP_METADATA | MXF_BITWISE));
+       EqualityFlags flags = EqualityFlags (LIBDCP_METADATA | MXF_INSPECT);
+       if (bitwise) {
+               flags = EqualityFlags (flags | MXF_BITWISE);
+       }
+
+       list<string> notes = a.equals (b, flags);
        if (notes.empty ()) {
                cout << "DCPs identical\n";
                exit (EXIT_SUCCESS);