summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/common.cc42
-rw-r--r--tools/common.h26
-rw-r--r--tools/dcpdiff.cc68
-rw-r--r--tools/dcpinfo.cc180
-rw-r--r--tools/wscript8
5 files changed, 256 insertions, 68 deletions
diff --git a/tools/common.cc b/tools/common.cc
new file mode 100644
index 00000000..1c0c1df8
--- /dev/null
+++ b/tools/common.cc
@@ -0,0 +1,42 @@
+/*
+ Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+ This program 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,
+ 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.
+
+*/
+
+#include "common.h"
+#include "dcp.h"
+
+using std::list;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
+
+void
+dcp::filter_errors (dcp::DCP::ReadErrors& errors, bool ignore_missing_assets)
+{
+ for (DCP::ReadErrors::iterator i = errors.begin(); i != errors.end(); ) {
+
+ DCP::ReadErrors::iterator tmp = i;
+ ++tmp;
+
+ if (ignore_missing_assets && dynamic_pointer_cast<MissingAssetError> (*i)) {
+ errors.erase (i);
+ }
+
+ i = tmp;
+ }
+}
+
diff --git a/tools/common.h b/tools/common.h
new file mode 100644
index 00000000..a9c657ce
--- /dev/null
+++ b/tools/common.h
@@ -0,0 +1,26 @@
+/*
+ Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+ This program 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,
+ 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.
+
+*/
+
+#include "exceptions.h"
+
+namespace dcp {
+
+extern void filter_errors (std::list<boost::shared_ptr<DCPReadError> >& errors, bool ignore_missing_assets);
+
+}
diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index 020c7ce1..75664810 100644
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -22,10 +22,11 @@
#include <getopt.h>
#include "dcp.h"
#include "exceptions.h"
+#include "common.h"
using namespace std;
using namespace boost;
-using namespace libdcp;
+using namespace dcp;
static bool verbose = false;
@@ -33,12 +34,14 @@ static void
help (string n)
{
cerr << "Syntax: " << n << " [OPTION] <DCP> <DCP>\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"
+ << " -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"
+ << " -k, --keep-going carry on in the event of errors, if possible\n"
+ << " --ignore-missing-assets ignore missing asset files\n"
<< "\n"
<< "The <DCP>s are the DCP directories to compare.\n"
<< "Comparison is of metadata and content, ignoring timestamps\n"
@@ -53,12 +56,34 @@ note (NoteType t, string n)
}
}
+DCP *
+load_dcp (boost::filesystem::path path, bool keep_going, bool ignore_missing_assets)
+{
+ DCP* dcp = 0;
+ try {
+ dcp = new DCP (path);
+ DCP::ReadErrors errors;
+ dcp->read (keep_going, &errors);
+ filter_errors (errors, ignore_missing_assets);
+ for (DCP::ReadErrors::const_iterator i = errors.begin(); i != errors.end(); ++i) {
+ cerr << (*i)->what() << "\n";
+ }
+ } catch (FileError& e) {
+ cerr << "Could not read DCP " << path.string() << "; " << e.what() << " " << e.filename() << "\n";
+ exit (EXIT_FAILURE);
+ }
+
+ return dcp;
+}
+
int
main (int argc, char* argv[])
{
EqualityOptions options;
options.max_mean_pixel_error = 5;
options.max_std_dev_pixel_error = 5;
+ bool keep_going = false;
+ bool ignore_missing_assets = false;
int option_index = 0;
while (1) {
@@ -69,10 +94,12 @@ main (int argc, char* argv[])
{ "names", no_argument, 0, 'n'},
{ "mean-pixel", required_argument, 0, 'm'},
{ "std-dev-pixel", required_argument, 0, 's'},
+ { "keep-going", no_argument, 0, 'k'},
+ { "ignore-missing-assets", no_argument, 0, 'A'},
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "Vhvnm:s:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "Vhvnm:s:kA", long_options, &option_index);
if (c == -1) {
break;
@@ -97,6 +124,12 @@ main (int argc, char* argv[])
case 's':
options.max_std_dev_pixel_error = atof (optarg);
break;
+ case 'k':
+ keep_going = true;
+ break;
+ case 'A':
+ ignore_missing_assets = true;
+ break;
}
}
@@ -115,23 +148,8 @@ main (int argc, char* argv[])
exit (EXIT_FAILURE);
}
- 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);
- }
-
- 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);
- }
+ DCP* a = load_dcp (argv[optind], keep_going, ignore_missing_assets);
+ DCP* b = load_dcp (argv[optind + 1], keep_going, ignore_missing_assets);
/* 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;
diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index 59e676f6..0c41b0c3 100644
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -1,3 +1,22 @@
+/*
+ Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+
+ This program 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,
+ 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.
+
+*/
+
#include <iostream>
#include <cstdlib>
#include <boost/filesystem.hpp>
@@ -5,40 +24,102 @@
#include "dcp.h"
#include "exceptions.h"
#include "reel.h"
-#include "sound_asset.h"
-#include "picture_asset.h"
-#include "subtitle_asset.h"
+#include "sound_mxf.h"
+#include "picture_mxf.h"
+#include "subtitle_content.h"
+#include "reel_picture_asset.h"
+#include "reel_sound_asset.h"
+#include "reel_subtitle_asset.h"
+#include "subtitle_string.h"
#include "cpl.h"
+#include "common.h"
using std::string;
using std::cerr;
using std::cout;
using std::list;
using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
static void
help (string n)
{
cerr << "Syntax: " << n << " [options] <DCP>\n"
- << " -s, --subtitles list all subtitles\n";
+ << " -s, --subtitles list all subtitles\n"
+ << " -k, --keep-going carry on in the event of errors, if possible\n"
+ << " --ignore-missing-assets ignore missing asset files\n";
+}
+
+static void
+main_picture (shared_ptr<Reel> reel)
+{
+ if (reel->main_picture() && reel->main_picture()->mxf()) {
+ cout << " Picture: "
+ << reel->main_picture()->mxf()->size().width
+ << "x"
+ << reel->main_picture()->mxf()->size().height << "\n";
+ }
+}
+
+static void
+main_sound (shared_ptr<Reel> reel)
+{
+ if (reel->main_sound() && reel->main_sound()->mxf()) {
+ cout << " Sound: "
+ << reel->main_sound()->mxf()->channels()
+ << " channels at "
+ << reel->main_sound()->mxf()->sampling_rate() << "Hz\n";
+ }
+}
+
+static void
+main_subtitle (shared_ptr<Reel> reel, bool list_subtitles)
+{
+ if (!reel->main_subtitle()) {
+ return;
+ }
+
+ list<shared_ptr<SubtitleString> > subs = reel->main_subtitle()->subtitle_content()->subtitles ();
+ cout << " Subtitle: " << subs.size() << " subtitles in " << reel->main_subtitle()->subtitle_content()->language() << "\n";
+ if (list_subtitles) {
+ for (list<shared_ptr<SubtitleString> >::const_iterator k = subs.begin(); k != subs.end(); ++k) {
+ cout << " " << (*k)->text() << "\n";
+ cout << " "
+ << "font:" << (*k)->font() << "; "
+ << "italic:" << (*k)->italic() << "; "
+ << "color:" << (*k)->color() << "; "
+ << "in:" << (*k)->in() << "; "
+ << "out:" << (*k)->out() << "; "
+ << "v_position:" << (*k)->v_position() << "; "
+ << "v_align:" << (*k)->v_align() << "; "
+ << "effect:" << (*k)->effect() << "; "
+ << "effect_color:" << (*k)->effect_color() << "; "
+ << "fade_up_time:" << (*k)->fade_up_time() << "; "
+ << "fade_down_time:" << (*k)->fade_down_time() << "; "
+ << "size: " << (*k)->size() << "\n";
+ }
+ }
}
int
main (int argc, char* argv[])
{
bool subtitles = false;
+ bool keep_going = false;
+ bool ignore_missing_assets = false;
int option_index = 0;
while (1) {
static struct option long_options[] = {
- { "version", no_argument, 0, 'v'},
- { "help", no_argument, 0, 'h'},
- { "subtitles", no_argument, 0, 's'},
+ { "version", no_argument, 0, 'v' },
+ { "help", no_argument, 0, 'h' },
+ { "subtitles", no_argument, 0, 's' },
+ { "keep-going", no_argument, 0, 'k' },
+ { "ignore-missing-assets", no_argument, 0, 'A' },
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhs", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhskA", long_options, &option_index);
if (c == -1) {
break;
@@ -54,6 +135,12 @@ main (int argc, char* argv[])
case 's':
subtitles = true;
break;
+ case 'k':
+ keep_going = true;
+ break;
+ case 'A':
+ ignore_missing_assets = true;
+ break;
}
}
@@ -68,57 +155,72 @@ main (int argc, char* argv[])
}
DCP* dcp = 0;
+ DCP::ReadErrors errors;
try {
dcp = new DCP (argv[optind]);
- dcp->read (false);
+ dcp->read (keep_going, &errors);
} catch (FileError& e) {
- cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << " " << e.filename() << "\n";
+ cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << "\n";
+ exit (EXIT_FAILURE);
+ } catch (DCPReadError& e) {
+ cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << "\n";
exit (EXIT_FAILURE);
}
-
+
cout << "DCP: " << boost::filesystem::path(argv[optind]).filename().string() << "\n";
+ dcp::filter_errors (errors, ignore_missing_assets);
+ for (DCP::ReadErrors::const_iterator i = errors.begin(); i != errors.end(); ++i) {
+ cerr << "Error: " << (*i)->what() << "\n";
+ }
+
list<shared_ptr<CPL> > cpls = dcp->cpls ();
for (list<shared_ptr<CPL> >::iterator i = cpls.begin(); i != cpls.end(); ++i) {
- cout << " CPL: " << (*i)->name() << "\n"
- << " Length: " << (*i)->length() << "\n"
- << " Frames per second: " << (*i)->frames_per_second() << "\n";
+ cout << " CPL: " << (*i)->annotation_text() << "\n";
list<shared_ptr<Reel> > reels = (*i)->reels ();
int R = 1;
for (list<shared_ptr<Reel> >::const_iterator j = reels.begin(); j != reels.end(); ++j) {
cout << " Reel " << R << "\n";
-
- if ((*j)->main_picture()) {
- cout << " Picture: " << (*j)->main_picture()->size().width << "x" << (*j)->main_picture()->size().height << "\n";
+
+ try {
+ main_picture (*j);
+ } catch (UnresolvedRefError& e) {
+ if (keep_going) {
+ if (!ignore_missing_assets) {
+ cerr << e.what() << " (for main picture)\n";
+ }
+ } else {
+ throw;
+ }
}
- if ((*j)->main_sound()) {
- cout << " Sound: " << (*j)->main_sound()->channels() << " channels at " << (*j)->main_sound()->sampling_rate() << "Hz\n";
+
+ try {
+ main_sound (*j);
+ } catch (UnresolvedRefError& e) {
+ if (keep_going) {
+ if (!ignore_missing_assets) {
+ cerr << e.what() << " (for main sound)\n";
+ }
+ } else {
+ throw;
+ }
}
- if ((*j)->main_subtitle()) {
- list<shared_ptr<Subtitle> > subs = (*j)->main_subtitle()->subtitles ();
- cout << " Subtitle: " << subs.size() << " subtitles in " << (*j)->main_subtitle()->language() << "\n";
- if (subtitles) {
- for (list<shared_ptr<Subtitle> >::const_iterator k = subs.begin(); k != subs.end(); ++k) {
- cout << " " << (*k)->text() << "\n";
- cout << " "
- << "font:" << (*k)->font() << "; "
- << "italic:" << (*k)->italic() << "; "
- << "color:" << (*k)->color() << "; "
- << "in:" << (*k)->in() << "; "
- << "out:" << (*k)->out() << "; "
- << "v_position:" << (*k)->v_position() << "; "
- << "v_align:" << (*k)->v_align() << "; "
- << "effect:" << (*k)->effect() << "; "
- << "effect_color:" << (*k)->effect_color() << "; "
- << "fade_up_time:" << (*k)->fade_up_time() << "; "
- << "fade_down_time:" << (*k)->fade_down_time() << "; "
- << "size: " << (*k)->size() << "\n";
+
+ try {
+ main_subtitle (*j, subtitles);
+ } catch (UnresolvedRefError& e) {
+ if (keep_going) {
+ if (!ignore_missing_assets) {
+ cerr << e.what() << " (for main subtitle)\n";
}
+ } else {
+ throw;
}
}
+
++R;
}
}
diff --git a/tools/wscript b/tools/wscript
index e4a32534..10389eac 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -1,13 +1,13 @@
def build(bld):
obj = bld(features = 'cxx cxxprogram')
- obj.use = ['libdcp']
+ obj.use = ['libdcp%s' % bld.env.API_VERSION]
obj.uselib = 'OPENJPEG CXML'
- obj.source = 'dcpdiff.cc'
+ obj.source = 'dcpdiff.cc common.cc'
obj.target = 'dcpdiff'
obj = bld(features = 'cxx cxxprogram')
- obj.use = ['libdcp']
+ obj.use = ['libdcp%s' % bld.env.API_VERSION]
obj.uselib = 'OPENJPEG CXML'
- obj.source = 'dcpinfo.cc'
+ obj.source = 'dcpinfo.cc common.cc'
obj.target = 'dcpinfo'
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-26 23:19:31 +0000