Basic detach of FFmpegContent, ImageContent, DCPContent

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 5c2b5496d3de187bb0b4987d674b6d77563d91ba..9f82be9c3751e18a404591a8ee900e318d1e63d2 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -20,12 +20,8 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#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;
@@ -33,6 +29,7 @@ struct AVStream;
 class Filter;
 class FFmpegSubtitleStream;
 class FFmpegAudioStream;
+class VideoContent;
 struct ffmpeg_pts_offset_test;
 struct audio_sampling_rate_test;
 
@@ -40,11 +37,12 @@ class FFmpegContentProperty : public VideoContentProperty
 {
 public:
        static int const SUBTITLE_STREAMS;
+       /** The chosen subtitle stream, or something about it */
        static int const SUBTITLE_STREAM;
        static int const FILTERS;
 };
 
-class FFmpegContent : public VideoContent, public AudioContent, public SubtitleContent
+class FFmpegContent : public AudioContent, public SubtitleContent
 {
 public:
        FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -70,7 +68,11 @@ public:
        std::vector<AudioStreamPtr> audio_streams () const;
 
        /* SubtitleContent */
-       bool has_subtitles () const;
+       bool has_text_subtitles () const;
+       bool has_image_subtitles () const;
+       double subtitle_video_frame_rate () const {
+               return video_frame_rate ();
+       }
 
        void set_filters (std::vector<Filter const *> const &);
 
@@ -101,7 +103,15 @@ public:
                return _first_video;
        }
 
-       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
+
+       void signal_subtitle_stream_changed ();
+
+       boost::shared_ptr<VideoContent> video;
+
+protected:
+       void add_properties (std::list<UserProperty> &) const;
 
 private:
        friend struct ffmpeg_pts_offset_test;
@@ -113,6 +123,12 @@ private:
        boost::optional<ContentTime> _first_video;
        /** Video filters that should be used when generating DCPs */
        std::vector<Filter const *> _filters;
+
+       AVColorRange _color_range;
+       AVColorPrimaries _color_primaries;
+       AVColorTransferCharacteristic _color_trc;
+       AVColorSpace _colorspace;
+       boost::optional<int> _bits_per_pixel;
 };
 
 #endif