Cope with DCPs that have no video and hence no video encoding.

5 files changed, 18 insertions, 9 deletions

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index c75babfc6..d26b726c2 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -428,7 +428,9 @@ DCPContent::as_xml(xmlpp::Element* element, bool with_paths, PathBehaviour path_
 			DCPOMATIC_ASSERT(false);
 		}
 	}
-	cxml::add_text_child(element, "VideoEncoding", video_encoding_to_string(_video_encoding));
+	if (_video_encoding) {
+		cxml::add_text_child(element, "VideoEncoding", video_encoding_to_string(*_video_encoding));
+	}
 	cxml::add_text_child(element, "ThreeD", _three_d ? "1" : "0");
 	if (_content_kind) {
 		cxml::add_text_child(element, "ContentKind", _content_kind->name());
diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 97e4b3cc4..80b7f64a8 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -191,7 +191,7 @@ public:
 		return _standard.get();
 	}
 
-	VideoEncoding video_encoding() const {
+	boost::optional<VideoEncoding> video_encoding() const {
 		boost::mutex::scoped_lock lm(_mutex);
 		return _video_encoding;
 	}
@@ -258,7 +258,7 @@ private:
 	EnumIndexedVector<bool, TextType> _reference_text;
 
 	boost::optional<dcp::Standard> _standard;
-	VideoEncoding _video_encoding = VideoEncoding::JPEG2000;
+	boost::optional<VideoEncoding> _video_encoding;
 	boost::optional<dcp::ContentKind> _content_kind;
 	bool _three_d;
 	/** ID of the CPL to use; older metadata might not specify this: in that case
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 6a1321878..4e8f611de 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -341,9 +341,16 @@ DCPExaminer::DCPExaminer(shared_ptr<const DCPContent> content, bool tolerant)
 	 * asset in each reel.  This checks that when we do have a key it's the right one.
 	 */
 	_kdm_valid = selected_cpl->can_be_read();
-	auto encoding = selected_cpl->picture_encoding();
-	DCPOMATIC_ASSERT(encoding == dcp::PictureEncoding::JPEG2000 || encoding == dcp::PictureEncoding::MPEG2);
-	_video_encoding = encoding == dcp::PictureEncoding::MPEG2 ? VideoEncoding::MPEG2 : VideoEncoding::JPEG2000;
+	switch (selected_cpl->picture_encoding()) {
+	case dcp::PictureEncoding::JPEG2000:
+		_video_encoding = VideoEncoding::JPEG2000;
+		break;
+	case dcp::PictureEncoding::MPEG2:
+		_video_encoding = VideoEncoding::MPEG2;
+		break;
+	default:
+		break;
+	}
 	_standard = selected_cpl->standard();
 	if (!selected_cpl->reels().empty()) {
 		auto first_reel = selected_cpl->reels()[0];
diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 6bc9793aa..8dd865762 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -150,7 +150,7 @@ public:
 		return _standard;
 	}
 
-	VideoEncoding video_encoding() const {
+	boost::optional<VideoEncoding> video_encoding() const {
 		return _video_encoding;
 	}
 
@@ -230,7 +230,7 @@ private:
 	bool _needs_assets = false;
 	bool _kdm_valid = false;
 	boost::optional<dcp::Standard> _standard;
-	VideoEncoding _video_encoding = VideoEncoding::JPEG2000;
+	boost::optional<VideoEncoding> _video_encoding;
 	bool _three_d = false;
 	boost::optional<dcp::ContentKind> _content_kind;
 	std::string _cpl;
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 3b121b677..415dbf3ba 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -524,7 +524,7 @@ public:
 				_film->set_video_frame_rate(dcp->video_frame_rate().get());
 			}
 
-			switch (dcp->video_encoding()) {
+			switch (dcp->video_encoding().get_value_or(VideoEncoding::JPEG2000)) {
 			case VideoEncoding::JPEG2000:
 				_viewer.set_optimisation(Optimisation::JPEG2000);
 				break;