Merge master.

[dcpomatic.git] / src / lib / ffmpeg_content.h

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 775cb92205c9f2b9a1660a3713d08c14ab5871f9..e637faf47643be48b0f3353bad5d440cb5231b62 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -26,15 +26,44 @@
 #include "subtitle_content.h"
 #include "audio_mapping.h"
 
+struct AVFormatContext;
+struct AVStream;
+
 class Filter;
 class ffmpeg_pts_offset_test;
 
-class FFmpegAudioStream
+class FFmpegStream
 {
 public:
-       FFmpegAudioStream (std::string n, int i, int f, int c)
+       FFmpegStream (std::string n, int i)
                : name (n)
                , id (i)
+               , _legacy_id (false)
+       {}
+                               
+       FFmpegStream (boost::shared_ptr<const cxml::Node>, int);
+
+       void as_xml (xmlpp::Node *) const;
+
+       /** @param c An AVFormatContext.
+        *  @return Stream index within the AVFormatContext.
+        */
+       int index (AVFormatContext const * c) const;
+       AVStream* stream (AVFormatContext const * c) const;
+
+       std::string name;
+       int id;
+       
+private:
+       /** If this is true, id is in fact the index */
+       bool _legacy_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)
@@ -42,12 +71,10 @@ public:
                mapping.make_default ();
        }
 
-       FFmpegAudioStream (boost::shared_ptr<const cxml::Node>);
+       FFmpegAudioStream (boost::shared_ptr<const cxml::Node>, int);
 
        void as_xml (xmlpp::Node *) const;
-       
-       std::string name;
-       int id;
+
        int frame_rate;
        int channels;
        AudioMapping mapping;
@@ -58,29 +85,30 @@ private:
 
        /* Constructor for tests */
        FFmpegAudioStream ()
-               : mapping (1)
+               : FFmpegStream ("", 0)
+               , frame_rate (0)
+               , channels (0)
+               , mapping (1)
        {}
 };
 
 extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
+extern bool operator!= (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
 
-class FFmpegSubtitleStream
+class FFmpegSubtitleStream : public FFmpegStream
 {
 public:
        FFmpegSubtitleStream (std::string n, int i)
-               : name (n)
-               , id (i)
+               : FFmpegStream (n, i)
        {}
        
-       FFmpegSubtitleStream (boost::shared_ptr<const cxml::Node>);
+       FFmpegSubtitleStream (boost::shared_ptr<const cxml::Node>, int);
 
        void as_xml (xmlpp::Node *) const;
-       
-       std::string name;
-       int id;
 };
 
 extern bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b);
+extern bool operator!= (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b);
 
 class FFmpegContentProperty : public VideoContentProperty
 {
@@ -96,7 +124,8 @@ 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>);
+       FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int version);
+       FFmpegContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
        boost::shared_ptr<FFmpegContent> shared_from_this () {
                return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
@@ -107,13 +136,13 @@ public:
        std::string technical_summary () const;
        std::string information () const;
        void as_xml (xmlpp::Node *) const;
-       Time full_length () const;
+       DCPTime full_length () const;
 
        std::string identifier () const;
        
        /* AudioContent */
        int audio_channels () const;
-       AudioContent::Frame audio_length () const;
+       AudioFrame audio_length () const;
        int content_audio_frame_rate () const;
        int output_audio_frame_rate () const;
        AudioMapping audio_mapping () const;
@@ -153,7 +182,7 @@ public:
                boost::mutex::scoped_lock lm (_mutex);
                return _first_video;
        }
-       
+
 private:
        friend class ffmpeg_pts_offset_test;