Add workaround for (apparently) incorrectly-labelled stereo MXFs.

2 files changed, 15 insertions, 3 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index 2aa1d575..7ec7577f 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -87,7 +87,7 @@ survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e)
 }
 
 void
-DCP::read (bool keep_going, ReadErrors* errors)
+DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mxf_type)
 {
 	/* Read the ASSETMAP */
 
@@ -160,7 +160,16 @@ DCP::read (bool keep_going, ReadErrors* errors)
 				case ASDCP::ESS_MPEG2_VES:
 					throw DCPReadError ("MPEG2 video essences are not supported");
 				case ASDCP::ESS_JPEG_2000:
-					other_assets.push_back (shared_ptr<MonoPictureAsset> (new MonoPictureAsset (path)));
+					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:
diff --git a/src/dcp.h b/src/dcp.h
index a723cebe..05c2026b 100644
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -71,8 +71,11 @@ public:
 	/** Read the DCP's structure into this object.
 	 *  @param keep_going true to try to keep going in the face of (some) errors.
 	 *  @param errors List of errors that will be added to if keep_going is true.
+	 *  @param ignore_incorrect_picture_mxf_type true to try loading MXF files marked as monoscopic
+	 *  as stereoscopic if the monoscopic load fails; fixes problems some 3D DCPs that (I think)
+	 *  have an incorrect descriptor in their MXF.
 	 */
-	void read (bool keep_going = false, ReadErrors* errors = 0);
+	void read (bool keep_going = false, ReadErrors* errors = 0, bool ignore_incorrect_picture_mxf_type = false);
 
 	/** Compare this DCP with another, according to various options.
 	 *  @param other DCP to compare this one to.