Move FFmpegStream classes into their own source files.

12 files changed, 324 insertions, 163 deletions

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 316b9614d..6f66ebbc0 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -25,6 +25,7 @@ extern "C" {
 #include <dcp/raw_convert.h>
 #include "ffmpeg.h"
 #include "ffmpeg_content.h"
+#include "ffmpeg_audio_stream.h"
 #include "exceptions.h"
 #include "util.h"
 
diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc
new file mode 100644
index 000000000..255952b8f
--- /dev/null
+++ b/src/lib/ffmpeg_audio_stream.cc
@@ -0,0 +1,47 @@
+/*
+    Copyright (C) 2013-2014 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 <libxml++/libxml++.h>
+#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
+#include "ffmpeg_audio_stream.h"
+
+using std::string;
+using dcp::raw_convert;
+
+FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
+	: FFmpegStream (node)
+	, mapping (node->node_child ("Mapping"), version)
+{
+	frame_rate = node->number_child<int> ("FrameRate");
+	channels = node->number_child<int64_t> ("Channels");
+	first_audio = node->optional_number_child<double> ("FirstAudio");
+}
+
+void
+FFmpegAudioStream::as_xml (xmlpp::Node* root) const
+{
+	FFmpegStream::as_xml (root);
+	root->add_child("FrameRate")->add_child_text (raw_convert<string> (frame_rate));
+	root->add_child("Channels")->add_child_text (raw_convert<string> (channels));
+	if (first_audio) {
+		root->add_child("FirstAudio")->add_child_text (raw_convert<string> (first_audio.get().get()));
+	}
+	mapping.as_xml (root->add_child("Mapping"));
+}
diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h
new file mode 100644
index 000000000..5e455d18a
--- /dev/null
+++ b/src/lib/ffmpeg_audio_stream.h
@@ -0,0 +1,57 @@
+/*
+    Copyright (C) 2013-2014 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 "ffmpeg_stream.h"
+#include "audio_mapping.h"
+#include "dcpomatic_time.h"
+
+class ffmpeg_pts_offset_test;
+
+class FFmpegAudioStream : public FFmpegStream
+{
+public:
+	FFmpegAudioStream (std::string n, int i, int f, int c)
+		: FFmpegStream (n, i)
+		, frame_rate (f)
+		, channels (c)
+		, mapping (c)
+	{
+		mapping.make_default ();
+	}
+
+	FFmpegAudioStream (cxml::ConstNodePtr, int);
+
+	void as_xml (xmlpp::Node *) const;
+
+	int frame_rate;
+	int channels;
+	AudioMapping mapping;
+	boost::optional<ContentTime> first_audio;
+
+private:
+	friend class ffmpeg_pts_offset_test;
+
+	/* Constructor for tests */
+	FFmpegAudioStream ()
+		: FFmpegStream ("", 0)
+		, frame_rate (0)
+		, channels (0)
+		, mapping (1)
+	{}
+};
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 6fc8bd7bb..a191959fc 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -24,6 +24,8 @@ extern "C" {
 #include <dcp/raw_convert.h>
 #include "ffmpeg_content.h"
 #include "ffmpeg_examiner.h"
+#include "ffmpeg_subtitle_stream.h"
+#include "ffmpeg_audio_stream.h"
 #include "compose.hpp"
 #include "job.h"
 #include "util.h"
@@ -312,86 +314,6 @@ operator!= (FFmpegStream const & a, FFmpegStream const & b)
 	return a._id != b._id;
 }
 
-FFmpegStream::FFmpegStream (cxml::ConstNodePtr node)
-	: name (node->string_child ("Name"))
-	, _id (node->number_child<int> ("Id"))
-{
-
-}
-
-void
-FFmpegStream::as_xml (xmlpp::Node* root) const
-{
-	root->add_child("Name")->add_child_text (name);
-	root->add_child("Id")->add_child_text (raw_convert<string> (_id));
-}
-
-FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
-	: FFmpegStream (node)
-	, mapping (node->node_child ("Mapping"), version)
-{
-	frame_rate = node->number_child<int> ("FrameRate");
-	channels = node->number_child<int64_t> ("Channels");
-	first_audio = node->optional_number_child<double> ("FirstAudio");
-}
-
-void
-FFmpegAudioStream::as_xml (xmlpp::Node* root) const
-{
-	FFmpegStream::as_xml (root);
-	root->add_child("FrameRate")->add_child_text (raw_convert<string> (frame_rate));
-	root->add_child("Channels")->add_child_text (raw_convert<string> (channels));
-	if (first_audio) {
-		root->add_child("FirstAudio")->add_child_text (raw_convert<string> (first_audio.get().get()));
-	}
-	mapping.as_xml (root->add_child("Mapping"));
-}
-
-bool
-FFmpegStream::uses_index (AVFormatContext const * fc, int index) const
-{
-	size_t i = 0;
-	while (i < fc->nb_streams) {
-		if (fc->streams[i]->id == _id) {
-			return int (i) == index;
-		}
-		++i;
-	}
-
-	return false;
-}
-
-AVStream *
-FFmpegStream::stream (AVFormatContext const * fc) const
-{
-	size_t i = 0;
-	while (i < fc->nb_streams) {
-		if (fc->streams[i]->id == _id) {
-			return fc->streams[i];
-		}
-		++i;
-	}
-
-	assert (false);
-	return 0;
-}
-
-/** Construct a SubtitleStream from a value returned from to_string().
- *  @param t String returned from to_string().
- *  @param v State file version.
- */
-FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node)
-	: FFmpegStream (node)
-{
-	
-}
-
-void
-FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
-{
-	FFmpegStream::as_xml (root);
-}
-
 DCPTime
 FFmpegContent::full_length () const
 {
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index c546d69eb..6f4980dc7 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -31,89 +31,10 @@ struct AVFormatContext;
 struct AVStream;
 
 class Filter;
+class FFmpegSubtitleStream;
+class FFmpegAudioStream;
 class ffmpeg_pts_offset_test;
 
-class FFmpegStream
-{
-public:
-	FFmpegStream (std::string n, int i)
-		: name (n)
-		, _id (i)
-	{}
-				
-	FFmpegStream (cxml::ConstNodePtr);
-
-	void as_xml (xmlpp::Node *) const;
-
-	/** @param c An AVFormatContext.
-	 *  @param index A stream index within the AVFormatContext.
-	 *  @return true if this FFmpegStream uses the given stream index.
-	 */
-	bool uses_index (AVFormatContext const * c, int index) const;
-	AVStream* stream (AVFormatContext const * c) const;
-
-	std::string technical_summary () const {
-		return "id " + boost::lexical_cast<std::string> (_id);
-	}
-
-	std::string identifier () const {
-		return boost::lexical_cast<std::string> (_id);
-	}
-
-	std::string name;
-
-	friend bool operator== (FFmpegStream const & a, FFmpegStream const & b);
-	friend bool operator!= (FFmpegStream const & a, FFmpegStream const & b);
-	
-private:
-	int _id;
-};
-
-class FFmpegAudioStream : public FFmpegStream
-{
-public:
-	FFmpegAudioStream (std::string n, int i, int f, int c)
-		: FFmpegStream (n, i)
-		, frame_rate (f)
-		, channels (c)
-		, mapping (c)
-	{
-		mapping.make_default ();
-	}
-
-	FFmpegAudioStream (cxml::ConstNodePtr, int);
-
-	void as_xml (xmlpp::Node *) const;
-
-	int frame_rate;
-	int channels;
-	AudioMapping mapping;
-	boost::optional<ContentTime> first_audio;
-
-private:
-	friend class ffmpeg_pts_offset_test;
-
-	/* Constructor for tests */
-	FFmpegAudioStream ()
-		: FFmpegStream ("", 0)
-		, frame_rate (0)
-		, channels (0)
-		, mapping (1)
-	{}
-};
-
-class FFmpegSubtitleStream : public FFmpegStream
-{
-public:
-	FFmpegSubtitleStream (std::string n, int i)
-		: FFmpegStream (n, i)
-	{}
-	
-	FFmpegSubtitleStream (cxml::ConstNodePtr);
-
-	void as_xml (xmlpp::Node *) const;
-};
-
 class FFmpegContentProperty : public VideoContentProperty
 {
 public:
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index d251a3744..9548eaae9 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -38,6 +38,8 @@ extern "C" {
 #include "util.h"
 #include "log.h"
 #include "ffmpeg_decoder.h"
+#include "ffmpeg_audio_stream.h"
+#include "ffmpeg_subtitle_stream.h"
 #include "filter_graph.h"
 #include "audio_buffers.h"
 #include "ffmpeg_content.h"
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 72db9bce1..a55113f89 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -23,6 +23,8 @@ extern "C" {
 }
 #include "ffmpeg_examiner.h"
 #include "ffmpeg_content.h"
+#include "ffmpeg_audio_stream.h"
+#include "ffmpeg_subtitle_stream.h"
 
 #include "i18n.h"
 
diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc
new file mode 100644
index 000000000..3fac33327
--- /dev/null
+++ b/src/lib/ffmpeg_stream.cc
@@ -0,0 +1,71 @@
+/*
+    Copyright (C) 2013-2014 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.
+
+*/
+
+extern "C" {
+#include <libavformat/avformat.h>
+}
+#include <libxml++/libxml++.h>
+#include <dcp/raw_convert.h>
+#include "ffmpeg_stream.h"
+
+using std::string;
+using dcp::raw_convert;
+
+FFmpegStream::FFmpegStream (cxml::ConstNodePtr node)
+	: name (node->string_child ("Name"))
+	, _id (node->number_child<int> ("Id"))
+{
+
+}
+
+void
+FFmpegStream::as_xml (xmlpp::Node* root) const
+{
+	root->add_child("Name")->add_child_text (name);
+	root->add_child("Id")->add_child_text (raw_convert<string> (_id));
+}
+
+bool
+FFmpegStream::uses_index (AVFormatContext const * fc, int index) const
+{
+	size_t i = 0;
+	while (i < fc->nb_streams) {
+		if (fc->streams[i]->id == _id) {
+			return int (i) == index;
+		}
+		++i;
+	}
+
+	return false;
+}
+
+AVStream *
+FFmpegStream::stream (AVFormatContext const * fc) const
+{
+	size_t i = 0;
+	while (i < fc->nb_streams) {
+		if (fc->streams[i]->id == _id) {
+			return fc->streams[i];
+		}
+		++i;
+	}
+
+	assert (false);
+	return 0;
+}
diff --git a/src/lib/ffmpeg_stream.h b/src/lib/ffmpeg_stream.h
new file mode 100644
index 000000000..6bbcd0b01
--- /dev/null
+++ b/src/lib/ffmpeg_stream.h
@@ -0,0 +1,65 @@
+/*
+    Copyright (C) 2013-2014 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.
+
+*/
+
+#ifndef DCPOMATIC_FFMPEG_STREAM_H
+#define DCPOMATIC_FFMPEG_STREAM_H
+
+#include <boost/lexical_cast.hpp>
+#include <libcxml/cxml.h>
+
+struct AVFormatContext;
+struct AVStream;
+
+class FFmpegStream
+{
+public:
+	FFmpegStream (std::string n, int i)
+		: name (n)
+		, _id (i)
+	{}
+				
+	FFmpegStream (cxml::ConstNodePtr);
+
+	void as_xml (xmlpp::Node *) const;
+
+	/** @param c An AVFormatContext.
+	 *  @param index A stream index within the AVFormatContext.
+	 *  @return true if this FFmpegStream uses the given stream index.
+	 */
+	bool uses_index (AVFormatContext const * c, int index) const;
+	AVStream* stream (AVFormatContext const * c) const;
+
+	std::string technical_summary () const {
+		return "id " + boost::lexical_cast<std::string> (_id);
+	}
+
+	std::string identifier () const {
+		return boost::lexical_cast<std::string> (_id);
+	}
+
+	std::string name;
+
+	friend bool operator== (FFmpegStream const & a, FFmpegStream const & b);
+	friend bool operator!= (FFmpegStream const & a, FFmpegStream const & b);
+	
+private:
+	int _id;
+};
+
+#endif
diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
new file mode 100644
index 000000000..3d8fd4e83
--- /dev/null
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -0,0 +1,36 @@
+/*
+    Copyright (C) 2013-2014 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 "ffmpeg_subtitle_stream.h"
+
+/** Construct a SubtitleStream from a value returned from to_string().
+ *  @param t String returned from to_string().
+ *  @param v State file version.
+ */
+FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node)
+	: FFmpegStream (node)
+{
+	
+}
+
+void
+FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
+{
+	FFmpegStream::as_xml (root);
+}
diff --git a/src/lib/ffmpeg_subtitle_stream.h b/src/lib/ffmpeg_subtitle_stream.h
new file mode 100644
index 000000000..76c71f016
--- /dev/null
+++ b/src/lib/ffmpeg_subtitle_stream.h
@@ -0,0 +1,34 @@
+/*
+    Copyright (C) 2013-2014 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 "dcpomatic_time.h"
+#include "ffmpeg_stream.h"
+
+class FFmpegSubtitleStream : public FFmpegStream
+{
+public:
+	FFmpegSubtitleStream (std::string n, int i)
+		: FFmpegStream (n, i)
+	{}
+	
+	FFmpegSubtitleStream (cxml::ConstNodePtr);
+
+	void as_xml (xmlpp::Node *) const;
+};
+
diff --git a/src/lib/wscript b/src/lib/wscript
index 8f26c53c6..d0fe9c8d8 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -26,9 +26,12 @@ sources = """
           file_group.cc
           filter_graph.cc
           ffmpeg.cc
+          ffmpeg_audio_stream.cc
           ffmpeg_content.cc
           ffmpeg_decoder.cc
           ffmpeg_examiner.cc
+          ffmpeg_stream.cc
+          ffmpeg_subtitle_stream.cc
           film.cc
           filter.cc
           frame_rate_change.cc