From 201b6fdf572c04424d870ac4d07d1d1a8725b24c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 14 Nov 2018 01:23:25 +0000 Subject: [PATCH 1/1] Simpole DCP recovery utility (dcprecover) added. --- run/tools/dcprecover | 12 ++++ src/asset_factory.cc | 87 +++++++++++++++++++++++ src/asset_factory.h | 38 ++++++++++ src/cpl.cc | 26 +++++++ src/cpl.h | 1 + src/dcp.cc | 42 +---------- src/wscript | 1 + tools/dcprecover.cc | 162 +++++++++++++++++++++++++++++++++++++++++++ tools/wscript | 4 +- 9 files changed, 331 insertions(+), 42 deletions(-) create mode 100755 run/tools/dcprecover create mode 100644 src/asset_factory.cc create mode 100644 src/asset_factory.h create mode 100644 tools/dcprecover.cc diff --git a/run/tools/dcprecover b/run/tools/dcprecover new file mode 100755 index 00000000..6277ccdc --- /dev/null +++ b/run/tools/dcprecover @@ -0,0 +1,12 @@ +#!/bin/bash + +export LD_LIBRARY_PATH=build/src:build/asdcplib/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH +if [ "$1" == "--debug" ]; then + shift + gdb --args build/tools/dcprecover "$@" +elif [ "$1" == "--valgrind" ]; then + shift + valgrind --tool="memcheck" --leak-check=full --show-reachable=yes build/tools/dcprecover "$@" +else + build/tools/dcprecover "$@" +fi diff --git a/src/asset_factory.cc b/src/asset_factory.cc new file mode 100644 index 00000000..22c2518e --- /dev/null +++ b/src/asset_factory.cc @@ -0,0 +1,87 @@ +/* + Copyright (C) 2018 Carl Hetherington + + 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. + + 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 libdcp. If not, see . + + 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 "mono_picture_asset.h" +#include "stereo_picture_asset.h" +#include "sound_asset.h" +#include "stereo_picture_asset.h" +#include "smpte_subtitle_asset.h" +#include "atmos_asset.h" +#include "compose.hpp" +#include "asset_factory.h" +#include + +using boost::shared_ptr; +using namespace dcp; + +shared_ptr +dcp::asset_factory (boost::filesystem::path path, bool ignore_incorrect_picture_mxf_type) +{ + /* XXX: asdcplib does not appear to support discovery of read MXFs standard + (Interop / SMPTE) + */ + + ASDCP::EssenceType_t type; + if (ASDCP::EssenceType (path.string().c_str(), type) != ASDCP::RESULT_OK) { + throw DCPReadError ("Could not find essence type"); + } + switch (type) { + case ASDCP::ESS_UNKNOWN: + case ASDCP::ESS_MPEG2_VES: + throw DCPReadError ("MPEG2 video essences are not supported"); + case ASDCP::ESS_JPEG_2000: + try { + return shared_ptr (new MonoPictureAsset (path)); + } catch (dcp::MXFFileError& e) { + if (ignore_incorrect_picture_mxf_type && e.number() == ASDCP::RESULT_SFORMAT) { + /* Tried to load it as mono but the error says it's stereo; try that instead */ + return shared_ptr (new StereoPictureAsset (path)); + } else { + throw; + } + } + case ASDCP::ESS_PCM_24b_48k: + case ASDCP::ESS_PCM_24b_96k: + return shared_ptr (new SoundAsset (path)); + case ASDCP::ESS_JPEG_2000_S: + return shared_ptr (new StereoPictureAsset (path)); + case ASDCP::ESS_TIMED_TEXT: + return shared_ptr (new SMPTESubtitleAsset (path)); + case ASDCP::ESS_DCDATA_DOLBY_ATMOS: + return shared_ptr (new AtmosAsset (path)); + default: + throw DCPReadError (String::compose ("Unknown MXF essence type %1 in %2", int(type), path.string())); + } + + return shared_ptr(); +} diff --git a/src/asset_factory.h b/src/asset_factory.h new file mode 100644 index 00000000..6567154d --- /dev/null +++ b/src/asset_factory.h @@ -0,0 +1,38 @@ +/* + Copyright (C) 2018 Carl Hetherington + + 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. + + 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 libdcp. If not, see . + + 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. +*/ + +namespace dcp { + +boost::shared_ptr asset_factory (boost::filesystem::path path, bool ignore_incorrect_picture_mxf_type); + +} diff --git a/src/cpl.cc b/src/cpl.cc index 5108161c..cc7237ea 100644 --- a/src/cpl.cc +++ b/src/cpl.cc @@ -170,6 +170,32 @@ CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr > +CPL::reel_assets () +{ + list > c; + + BOOST_FOREACH (shared_ptr i, _reels) { + if (i->main_picture ()) { + c.push_back (i->main_picture()); + } + if (i->main_sound ()) { + c.push_back (i->main_sound()); + } + if (i->main_subtitle ()) { + c.push_back (i->main_subtitle()); + } + BOOST_FOREACH (shared_ptr j, i->closed_captions()) { + c.push_back (j); + } + if (i->atmos ()) { + c.push_back (i->atmos()); + } + } + + return c; +} + list > CPL::reel_assets () const { diff --git a/src/cpl.h b/src/cpl.h index bcc1f06b..259281dc 100644 --- a/src/cpl.h +++ b/src/cpl.h @@ -119,6 +119,7 @@ public: /** @return the ReelAssets in this CPL in all reels. */ std::list > reel_assets () const; + std::list > reel_assets (); bool encrypted () const; diff --git a/src/dcp.cc b/src/dcp.cc index 08febadc..8bf2f02f 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -57,6 +57,7 @@ #include "reel_asset.h" #include "font_asset.h" #include "pkl.h" +#include "asset_factory.h" #include #include #include @@ -228,46 +229,7 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx *pkl_type == SMPTESubtitleAsset::static_pkl_type(*_standard) ) { - /* XXX: asdcplib does not appear to support discovery of read MXFs standard - (Interop / SMPTE) - */ - - ASDCP::EssenceType_t type; - if (ASDCP::EssenceType (path.string().c_str(), type) != ASDCP::RESULT_OK) { - throw DCPReadError ("Could not find essence type"); - } - switch (type) { - case ASDCP::ESS_UNKNOWN: - case ASDCP::ESS_MPEG2_VES: - throw DCPReadError ("MPEG2 video essences are not supported"); - case ASDCP::ESS_JPEG_2000: - try { - other_assets.push_back (shared_ptr (new MonoPictureAsset (path))); - } catch (dcp::MXFFileError& e) { - if (ignore_incorrect_picture_mxf_type && e.number() == ASDCP::RESULT_SFORMAT) { - /* Tried to load it as mono but the error says it's stereo; try that instead */ - other_assets.push_back (shared_ptr (new StereoPictureAsset (path))); - } else { - throw; - } - } - break; - case ASDCP::ESS_PCM_24b_48k: - case ASDCP::ESS_PCM_24b_96k: - other_assets.push_back (shared_ptr (new SoundAsset (path))); - break; - case ASDCP::ESS_JPEG_2000_S: - other_assets.push_back (shared_ptr (new StereoPictureAsset (path))); - break; - case ASDCP::ESS_TIMED_TEXT: - other_assets.push_back (shared_ptr (new SMPTESubtitleAsset (path))); - break; - case ASDCP::ESS_DCDATA_DOLBY_ATMOS: - other_assets.push_back (shared_ptr (new AtmosAsset (path))); - break; - default: - throw DCPReadError (String::compose ("Unknown MXF essence type %1 in %2", int(type), path.string())); - } + other_assets.push_back (asset_factory(path, ignore_incorrect_picture_mxf_type)); } else if (*pkl_type == FontAsset::static_pkl_type(*_standard)) { other_assets.push_back (shared_ptr (new FontAsset (i->first, path))); } else if (*pkl_type == "image/png") { diff --git a/src/wscript b/src/wscript index 3ab16157..5fe7fc80 100644 --- a/src/wscript +++ b/src/wscript @@ -35,6 +35,7 @@ from waflib import TaskGen def build(bld): source = """ asset.cc + asset_factory.cc asset_writer.cc atmos_asset.cc atmos_asset_writer.cc diff --git a/tools/dcprecover.cc b/tools/dcprecover.cc new file mode 100644 index 00000000..b747a5da --- /dev/null +++ b/tools/dcprecover.cc @@ -0,0 +1,162 @@ +/* + Copyright (C) 2018 Carl Hetherington + + 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. + + 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 libdcp. If not, see . + + 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 "cpl.h" +#include "exceptions.h" +#include "asset_factory.h" +#include "reel_asset.h" +#include +#include +#include +#include +#include + +using std::cerr; +using std::cout; +using std::string; +using std::list; +using boost::shared_ptr; +using boost::optional; + +static void +help (string n) +{ + cerr << "Syntax: " << n << " [OPTION] ]\n" + << " -h, --help show this help\n" + << " -o, --output output DCP directory\n"; +} + +void progress (float f) +{ + cout << (f * 100) << "% \r"; +} + +int +main (int argc, char* argv[]) +{ + int option_index = 0; + optional output; + while (true) { + struct option long_options[] = { + { "help", no_argument, 0, 'h' }, + { "output", required_argument, 0, 'o' }, + { 0, 0, 0, 0 } + }; + + int c = getopt_long (argc, argv, "ho:", long_options, &option_index); + + if (c == -1) { + break; + } + + switch (c) { + case 'h': + help (argv[0]); + exit (EXIT_SUCCESS); + case 'o': + output = optarg; + break; + } + } + + if (optind >= argc) { + help (argv[0]); + exit (EXIT_FAILURE); + } + + boost::filesystem::path dcp_dir = argv[optind]; + + /* Try to read it and report errors */ + + dcp::DCP dcp (dcp_dir); + dcp::DCP::ReadErrors errors; + try { + dcp.read (true, &errors, true); + } catch (dcp::DCPReadError& e) { + cout << "Error:" << e.what() << "\n"; + } + + BOOST_FOREACH (shared_ptr i, errors) { + cout << "Error: " << i->what() << "\n"; + } + + /* Look for a CPL */ + + shared_ptr cpl; + for (boost::filesystem::directory_iterator i(dcp_dir); i != boost::filesystem::directory_iterator(); ++i) { + if (i->path().extension() == ".xml") { + try { + cpl.reset(new dcp::CPL(i->path())); + } catch (dcp::DCPReadError& e) { + cout << "Error: " << e.what() << "\n"; + } catch (xmlpp::parse_error& e) { + cout << "Error: " << e.what() << "\n"; + } + } + } + + if (cpl) { + cout << "Got a CPL!\n"; + + if (!output) { + cerr << "No output directory specified.\n"; + exit(1); + } + + /* Read all MXF assets */ + list > assets; + for (boost::filesystem::directory_iterator i(dcp_dir); i != boost::filesystem::directory_iterator(); ++i) { + if (i->path().extension() == ".mxf") { + try { + shared_ptr asset = dcp::asset_factory(i->path(), true); + asset->set_file (*output / i->path().filename()); + cout << "Hashing " << i->path().filename() << "\n"; + asset->hash (&progress); + cout << "100% \n"; + assets.push_back (asset); + } catch (dcp::DCPReadError& e) { + cout << "Error: " << e.what() << "\n"; + } + } + } + + dcp::DCP fixed (*output); + fixed.add (cpl); + fixed.resolve_refs (assets); + fixed.write_xml (dcp::INTEROP); + cout << "Fixed XML files written to " << output->string() << "\n"; + } + + return 0; +} diff --git a/tools/wscript b/tools/wscript index 96c31fdc..99f5207e 100644 --- a/tools/wscript +++ b/tools/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2016 Carl Hetherington +# Copyright (C) 2012-2018 Carl Hetherington # # This file is part of libdcp. # @@ -44,7 +44,7 @@ def build(bld): obj.source = 'dcpinfo.cc common.cc' obj.target = 'dcpinfo' - for f in ['dumpsub', 'decryptmxf', 'kdm', 'thumb']: + for f in ['dumpsub', 'decryptmxf', 'kdm', 'thumb', 'recover']: obj = bld(features='cxx cxxprogram') obj.use = ['libdcp%s' % bld.env.API_VERSION] obj.uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_CTH BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL' -- 2.30.2