Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calcu...

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index c546d69eb70e9a74107b2c8b3f860a17a3d14b30..76ba43567d9961ea2c1798c3ebfe13fb27e9772b 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -20,99 +20,20 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #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"
 #include "audio_mapping.h"
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/lexical_cast.hpp>
 
 struct AVFormatContext;
 struct AVStream;
 
 class Filter;
-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 FFmpegSubtitleStream;
+class FFmpegAudioStream;
+struct ffmpeg_pts_offset_test;
 
 class FFmpegContentProperty : public VideoContentProperty
 {
@@ -138,7 +59,6 @@ public:
        void examine (boost::shared_ptr<Job>);
        std::string summary () const;
        std::string technical_summary () const;
-       std::string information () const;
        void as_xml (xmlpp::Node *) const;
        DCPTime full_length () const;
 
@@ -152,6 +72,9 @@ public:
        void set_audio_mapping (AudioMapping);
        boost::filesystem::path audio_analysis_path () const;
 
+       /* SubtitleContent */
+       bool has_subtitles () const;
+
        void set_filters (std::vector<Filter const *> const &);
        
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
@@ -187,8 +110,10 @@ public:
                return _first_video;
        }
 
+       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+
 private:
-       friend class ffmpeg_pts_offset_test;
+       friend struct ffmpeg_pts_offset_test;
        
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
        boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;