X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=367c30103e77812927878d0f2f31062e995cc647;hb=e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3;hp=d588fd2ee2d820d4495861ad43210406c767158c;hpb=58588c485eac7c488a574fe923576f109ec0134e;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index d588fd2ee..367c30103 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -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
@@ -21,6 +21,7 @@
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
 #include <boost/enable_shared_from_this.hpp>
+#include <boost/lexical_cast.hpp>
 #include "video_content.h"
 #include "audio_content.h"
 #include "subtitle_content.h"
@@ -30,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 (boost::shared_ptr<const cxml::Node>);
-
-	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 (boost::shared_ptr<const cxml::Node>, int);
-
-	void as_xml (xmlpp::Node *) const;
-
-	int frame_rate;
-	int channels;
-	AudioMapping mapping;
-	boost::optional<double> 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 (boost::shared_ptr<const cxml::Node>);
-
-	void as_xml (xmlpp::Node *) const;
-};
-
 class FFmpegContentProperty : public VideoContentProperty
 {
 public:
@@ -127,7 +49,7 @@ class FFmpegContent : public VideoContent, public AudioContent, public SubtitleC
 {
 public:
 	FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int version);
+	FFmpegContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int version, std::list<std::string> &);
 	FFmpegContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
 	boost::shared_ptr<FFmpegContent> shared_from_this () {
@@ -145,11 +67,11 @@ public:
 	
 	/* AudioContent */
 	int audio_channels () const;
-	AudioFrame audio_length () const;
-	int content_audio_frame_rate () const;
-	int output_audio_frame_rate () const;
+	ContentTime audio_length () const;
+	int audio_frame_rate () const;
 	AudioMapping audio_mapping () const;
 	void set_audio_mapping (AudioMapping);
+	boost::filesystem::path audio_analysis_path () const;
 
 	void set_filters (std::vector<Filter const *> const &);
 	
@@ -181,11 +103,13 @@ public:
 	void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
 	void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
 
-	boost::optional<double> first_video () const {
+	boost::optional<ContentTime> first_video () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _first_video;
 	}
 
+	bool has_subtitle_during (ContentTimePeriod) const;
+
 private:
 	friend class ffmpeg_pts_offset_test;
 	
@@ -193,7 +117,7 @@ private:
 	boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
 	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
 	boost::shared_ptr<FFmpegAudioStream> _audio_stream;
-	boost::optional<double> _first_video;
+	boost::optional<ContentTime> _first_video;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;
 };