Simpole DCP recovery utility (dcprecover) added.

6 files changed, 155 insertions, 40 deletions

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 <cth@carlh.net>
+
+    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 <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 "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 <boost/shared_ptr.hpp>
+
+using boost::shared_ptr;
+using namespace dcp;
+
+shared_ptr<Asset>
+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<MonoPictureAsset> (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<StereoPictureAsset> (new StereoPictureAsset (path));
+			} else {
+				throw;
+			}
+		}
+	case ASDCP::ESS_PCM_24b_48k:
+	case ASDCP::ESS_PCM_24b_96k:
+		return shared_ptr<SoundAsset> (new SoundAsset (path));
+	case ASDCP::ESS_JPEG_2000_S:
+		return shared_ptr<StereoPictureAsset> (new StereoPictureAsset (path));
+	case ASDCP::ESS_TIMED_TEXT:
+		return shared_ptr<SMPTESubtitleAsset> (new SMPTESubtitleAsset (path));
+	case ASDCP::ESS_DCDATA_DOLBY_ATMOS:
+		return shared_ptr<AtmosAsset> (new AtmosAsset (path));
+	default:
+		throw DCPReadError (String::compose ("Unknown MXF essence type %1 in %2", int(type), path.string()));
+	}
+
+	return shared_ptr<Asset>();
+}
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 <cth@carlh.net>
+
+    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 <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.
+*/
+
+namespace dcp {
+
+boost::shared_ptr<Asset> 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<cons
 	set_file (file);
 }
 
+list<shared_ptr<ReelAsset> >
+CPL::reel_assets ()
+{
+	list<shared_ptr<ReelAsset> > c;
+
+	BOOST_FOREACH (shared_ptr<Reel> 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<ReelClosedCaptionAsset> j, i->closed_captions()) {
+			c.push_back (j);
+		}
+		if (i->atmos ()) {
+			c.push_back (i->atmos());
+		}
+	}
+
+	return c;
+}
+
 list<shared_ptr<const ReelAsset> >
 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<boost::shared_ptr<const ReelAsset> > reel_assets () const;
+	std::list<boost::shared_ptr<ReelAsset> > 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 <asdcp/AS_DCP.h>
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/app.h>
@@ -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<MonoPictureAsset> (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<StereoPictureAsset> (new StereoPictureAsset (path)));
-						} else {
-							throw;
-						}
-					}
-					break;
-				case ASDCP::ESS_PCM_24b_48k:
-				case ASDCP::ESS_PCM_24b_96k:
-					other_assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (path)));
-					break;
-				case ASDCP::ESS_JPEG_2000_S:
-					other_assets.push_back (shared_ptr<StereoPictureAsset> (new StereoPictureAsset (path)));
-					break;
-				case ASDCP::ESS_TIMED_TEXT:
-					other_assets.push_back (shared_ptr<SMPTESubtitleAsset> (new SMPTESubtitleAsset (path)));
-					break;
-			        case ASDCP::ESS_DCDATA_DOLBY_ATMOS:
-					other_assets.push_back (shared_ptr<AtmosAsset> (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<FontAsset> (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