Basics of Atmos content support; can be added to project and appears in timeline.

5 files changed, 143 insertions, 1 deletions

diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc
new file mode 100644
index 000000000..927d36ff6
--- /dev/null
+++ b/src/lib/atmos_mxf_content.cc
@@ -0,0 +1,92 @@
+/*
+    Copyright (C) 2016 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 "atmos_mxf_content.h"
+#include "job.h"
+#include "film.h"
+#include "compose.hpp"
+#include <dcp/atmos_asset.h>
+#include <dcp/exceptions.h>
+#include <libxml++/libxml++.h>
+
+#include "i18n.h"
+
+using std::list;
+using std::string;
+using boost::shared_ptr;
+
+AtmosMXFContent::AtmosMXFContent (shared_ptr<const Film> film, boost::filesystem::path path)
+	: Content (film, path)
+{
+
+}
+
+AtmosMXFContent::AtmosMXFContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int)
+	: Content (film, node)
+{
+
+}
+
+bool
+AtmosMXFContent::valid_mxf (boost::filesystem::path path)
+{
+	try {
+		shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path));
+		return true;
+	} catch (dcp::MXFFileError& e) {
+
+	} catch (dcp::DCPReadError& e) {
+
+	}
+
+	return false;
+}
+
+void
+AtmosMXFContent::examine (shared_ptr<Job> job)
+{
+	job->set_progress_unknown ();
+	Content::examine (job);
+	shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path(0)));
+
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_length = a->intrinsic_duration ();
+	}
+}
+
+string
+AtmosMXFContent::summary () const
+{
+	return String::compose (_("%1 [Atmos]"), path_summary());
+}
+
+void
+AtmosMXFContent::as_xml (xmlpp::Node* node) const
+{
+	node->add_child("Type")->add_child_text ("AtmosMXF");
+	Content::as_xml (node);
+}
+
+DCPTime
+AtmosMXFContent::full_length () const
+{
+	FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
+	return DCPTime::from_frames (llrint (_length * frc.factor()), film()->video_frame_rate());
+}
diff --git a/src/lib/atmos_mxf_content.h b/src/lib/atmos_mxf_content.h
new file mode 100644
index 000000000..b03094823
--- /dev/null
+++ b/src/lib/atmos_mxf_content.h
@@ -0,0 +1,41 @@
+/*
+    Copyright (C) 2016 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 "content.h"
+
+class AtmosMXFContent : public Content
+{
+public:
+	AtmosMXFContent (boost::shared_ptr<const Film> film, boost::filesystem::path path);
+	AtmosMXFContent (boost::shared_ptr<const Film> film, cxml::ConstNodePtr node, int version);
+
+	boost::shared_ptr<AtmosMXFContent> shared_from_this () {
+		return boost::dynamic_pointer_cast<AtmosMXFContent> (Content::shared_from_this ());
+	}
+
+	void examine (boost::shared_ptr<Job> job);
+	std::string summary () const;
+	void as_xml (xmlpp::Node* node) const;
+	DCPTime full_length () const;
+
+	static bool valid_mxf (boost::filesystem::path path);
+
+private:
+	Frame _length;
+};
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 706c79754..df803809f 100644
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -24,6 +24,7 @@
 #include "ffmpeg_content.h"
 #include "audio_content.h"
 #include "image_content.h"
+#include "atmos_mxf_content.h"
 #include "text_subtitle_content.h"
 #include "dcp_content.h"
 #include "dcp_subtitle_content.h"
@@ -90,6 +91,8 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
 		content.reset (new DCPSubtitleContent (film, node, version));
 	} else if (type == "VideoMXF") {
 		content.reset (new VideoMXFContent (film, node, version));
+	} else if (type == "AtmosMXF") {
+		content.reset (new AtmosMXFContent (film, node, version));
 	}
 
 	return content;
@@ -167,6 +170,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 			content.reset (new DCPSubtitleContent (film, path));
 		} else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) {
 			content.reset (new VideoMXFContent (film, path));
+		} else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) {
+			content.reset (new AtmosMXFContent (film, path));
 		}
 
 		if (!content) {
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 0c513056c..6d155836f 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -188,7 +188,10 @@ Player::setup_pieces ()
 			frc = FrameRateChange (vmc->active_video_frame_rate(), _film->video_frame_rate());
 		}
 
-		DCPOMATIC_ASSERT (decoder);
+		if (!decoder) {
+			/* Not something that we can decode; e.g. Atmos content */
+			continue;
+		}
 
 		if (decoder->video && _ignore_video) {
 			decoder->video->set_ignore ();
diff --git a/src/lib/wscript b/src/lib/wscript
index 727a398af..4c5ed04db 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -21,6 +21,7 @@ import i18n
 
 sources = """
           analyse_audio_job.cc
+          atmos_mxf_content.cc
           audio_analysis.cc
           audio_buffers.cc
           audio_content.cc