It builds again.

[libdcp.git] / tools / dcpdiff.cc

diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index 0b6ffd92b5f92e52960741336103577237922f4f..dda7c3c30a03f1d88deea73c9450aba1bd942a67 100644 (file)
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -6,57 +6,77 @@
 
 using namespace std;
 using namespace boost;
-using namespace libdcp;
+using namespace dcp;
+
+static bool verbose = false;
 
 static void
 help (string n)
 {
        cerr << "Syntax: " << n << " [OPTION] <DCP> <DCP>\n"
-            << "  -b, --bitwise      bitwise check\n"
-            << "  -v, --version      show libdcp version\n"
-            << "  -d, --verbose      be verbose\n"
-            << "  -h, --help         show this help\n"
+            << "  -V, --version        show libdcp version\n"
+            << "  -h, --help           show this help\n"
+            << "  -v, --verbose        be verbose\n"
+            << "  -n, --names          allow differing MXF names\n"
+            << "  -m, --mean-pixel     maximum allowed mean pixel error (default 5)\n"
+            << "  -s, --std-dev-pixel  maximum allowed standard deviation of pixel error (default 5)\n"
             << "\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";
+            << "Comparison is of metadata and content, ignoring timestamps\n"
+            << "and differing UUIDs.\n";
+}
+
+void
+note (NoteType t, string n)
+{
+       if (t == ERROR || verbose) {
+               cout << " " << n << "\n";
+       }
 }
 
 int
 main (int argc, char* argv[])
 {
        EqualityOptions options;
-       options.flags = EqualityFlags (LIBDCP_METADATA | MXF_INSPECT);
-       options.verbose = false;
+       options.max_mean_pixel_error = 5;
+       options.max_std_dev_pixel_error = 5;
        
        int option_index = 0;
        while (1) {
                static struct option long_options[] = {
-                       { "bitwise", no_argument, 0, 'b'},
-                       { "version", no_argument, 0, 'v'},
+                       { "version", no_argument, 0, 'V'},
                        { "help", no_argument, 0, 'h'},
-                       { "verbose", no_argument, 0, 'd'},
+                       { "verbose", no_argument, 0, 'v'},
+                       { "names", no_argument, 0, 'n'},
+                       { "mean-pixel", required_argument, 0, 'm'},
+                       { "std-dev-pixel", required_argument, 0, 's'},
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "bvhd", long_options, &option_index);
+               int c = getopt_long (argc, argv, "Vhvnm:s:", long_options, &option_index);
 
                if (c == -1) {
                        break;
                }
 
                switch (c) {
-               case 'b':
-                       options.flags = EqualityFlags (options.flags | MXF_BITWISE);
-                       break;
-               case 'v':
+               case 'V':
                        cout << "dcpdiff version " << LIBDCP_VERSION << "\n";
                        exit (EXIT_SUCCESS);
                case 'h':
                        help (argv[0]);
                        exit (EXIT_SUCCESS);
-               case 'd':
-                       options.verbose = true;
+               case 'v':
+                       verbose = true;
+                       break;
+               case 'n':
+                       options.mxf_names_can_differ = true;
+                       break;
+               case 'm':
+                       options.max_mean_pixel_error = atof (optarg);
+                       break;
+               case 's':
+                       options.max_std_dev_pixel_error = atof (optarg);
                        break;
                }
        }
@@ -79,6 +99,7 @@ main (int argc, char* argv[])
        DCP* a = 0;
        try {
                a = new DCP (argv[optind]);
+               a->read ();
        } catch (FileError& e) {
                cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << " " << e.filename() << "\n";
                exit (EXIT_FAILURE);
@@ -87,22 +108,19 @@ main (int argc, char* argv[])
        DCP* b = 0;
        try {
                b = new DCP (argv[optind + 1]);
+               b->read ();
        } catch (FileError& e) {
                cerr << "Could not read DCP " << argv[optind + 1] << "; " << e.what() << " " << e.filename() << "\n";
                exit (EXIT_FAILURE);
        }
 
-       options.max_mean_pixel_error = 5;
-       options.max_std_dev_pixel_error = 5;
+       /* I think this is just below the LSB at 16-bits (ie the 8th most significant bit at 24-bit) */
+       options.max_audio_sample_error = 255;
 
-       list<string> notes = a->equals (*b, options);
-       if (notes.empty ()) {
-               cout << "DCPs equal\n";
-               exit (EXIT_SUCCESS);
-       }
+       bool const equals = a->equals (*b, options, boost::bind (note, _1, _2));
 
-       for (list<string>::iterator i = notes.begin(); i != notes.end(); ++i) {
-               cout << "  " << *i << "\n";
+       if (equals) {
+               exit (EXIT_SUCCESS);
        }
 
        exit (EXIT_FAILURE);