/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ 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.
- This program is distributed in the hope that it will be useful,
+ 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 this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+ 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 "dcp.h"
#include "common.h"
#include "mxf.h"
#include <getopt.h>
+#include <boost/optional.hpp>
+#include <boost/shared_ptr.hpp>
#include <boost/filesystem.hpp>
#include <iostream>
-
-using namespace std;
-using namespace boost;
+#include <list>
+
+using std::list;
+using std::cerr;
+using std::cout;
+using std::string;
+using boost::shared_ptr;
+using boost::optional;
+using boost::dynamic_pointer_cast;
using namespace dcp;
static bool verbose = false;
<< " -V, --version show libdcp version\n"
<< " -h, --help show this help\n"
<< " -v, --verbose be verbose\n"
- << " -n, --mxf-filenames allow differing MXF filenames\n"
<< " --cpl-annotation-texts allow differing CPL annotation texts\n"
+ << " --reel-annotation-texts allow differing reel annotation texts\n"
+ << " -a, --annotation-texts allow different CPL and reel annotation texts\n"
+ << " -d, --issue-dates allow different issue dates\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"
<< " --key hexadecimal key to use to decrypt MXFs\n"
{
if (t == DCP_ERROR || verbose) {
cout << " " << n << "\n";
+ cout.flush ();
}
}
}
}
}
-
+
} catch (FileError& e) {
cerr << "Could not read DCP " << path.string() << "; " << e.what() << " " << e.filename() << "\n";
exit (EXIT_FAILURE);
options.max_mean_pixel_error = 5;
options.max_std_dev_pixel_error = 5;
options.reel_hashes_can_differ = true;
- bool keep_going = false;
+ options.reel_annotation_texts_can_differ = false;
+ options.keep_going = false;
bool ignore_missing_assets = false;
optional<string> key;
-
+
int option_index = 0;
while (1) {
static struct option long_options[] = {
{ "version", no_argument, 0, 'V'},
{ "help", no_argument, 0, 'h'},
{ "verbose", no_argument, 0, 'v'},
- { "mxf-filenames", no_argument, 0, 'n'},
{ "mean-pixel", required_argument, 0, 'm'},
{ "std-dev-pixel", required_argument, 0, 's'},
{ "keep-going", no_argument, 0, 'k'},
+ { "annotation-texts", no_argument, 0, 'a'},
+ { "issue-dates", no_argument, 0, 'd'},
/* From here we're using random capital letters for the short option */
{ "ignore-missing-assets", no_argument, 0, 'A'},
{ "cpl-annotation-texts", no_argument, 0, 'C'},
{ "key", required_argument, 0, 'D'},
+ { "reel-annotation-texts", no_argument, 0, 'E'},
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "Vhvnm:s:kACD:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "Vhvm:s:kadACD:E", long_options, &option_index);
if (c == -1) {
break;
case 'v':
verbose = true;
break;
- case 'n':
- options.mxf_filenames_can_differ = true;
- break;
case 'm':
options.max_mean_pixel_error = atof (optarg);
break;
options.max_std_dev_pixel_error = atof (optarg);
break;
case 'k':
- keep_going = true;
+ options.keep_going = true;
+ break;
+ case 'a':
+ options.cpl_annotation_texts_can_differ = options.reel_annotation_texts_can_differ = true;
+ break;
+ case 'd':
+ options.issue_dates_can_differ = true;
break;
case 'A':
ignore_missing_assets = true;
case 'D':
key = string (optarg);
break;
+ case 'E':
+ options.reel_annotation_texts_can_differ = true;
+ break;
}
}
exit (EXIT_FAILURE);
}
- if (!filesystem::exists (argv[optind])) {
+ if (!boost::filesystem::exists (argv[optind])) {
cerr << argv[0] << ": DCP " << argv[optind] << " not found.\n";
exit (EXIT_FAILURE);
}
- if (!filesystem::exists (argv[optind + 1])) {
+ if (!boost::filesystem::exists (argv[optind + 1])) {
cerr << argv[0] << ": DCP " << argv[optind + 1] << " not found.\n";
exit (EXIT_FAILURE);
}
- DCP* a = load_dcp (argv[optind], keep_going, ignore_missing_assets, key);
- DCP* b = load_dcp (argv[optind + 1], keep_going, ignore_missing_assets, key);
+ DCP* a = load_dcp (argv[optind], options.keep_going, ignore_missing_assets, key);
+ DCP* b = load_dcp (argv[optind + 1], options.keep_going, ignore_missing_assets, key);
/* 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;
projects / libdcp.git / blobdiff