Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 75e507d4d799a7cfc24be6224bdaca26099c7eed..44f1c28472c08cc1885a4c021a723b9a6a31bc2b 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -24,20 +24,23 @@
 #include "util.h"
 
 class VideoDecoder;
+class Ratio;
 
 class VideoContentProperty
 {
 public:
-       static int const VIDEO_LENGTH;
        static int const VIDEO_SIZE;
        static int const VIDEO_FRAME_RATE;
+       static int const VIDEO_CROP;
+       static int const VIDEO_RATIO;
 };
 
 class VideoContent : public virtual Content
 {
 public:
-       VideoContent (boost::filesystem::path);
-       VideoContent (boost::shared_ptr<const cxml::Node>);
+       VideoContent (boost::shared_ptr<const Film>, Time, ContentVideoFrame);
+       VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
+       VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
        VideoContent (VideoContent const &);
 
        void as_xml (xmlpp::Node *) const;
@@ -58,6 +61,24 @@ public:
                return _video_frame_rate;
        }
 
+       void set_crop (Crop);
+       void set_left_crop (int);
+       void set_right_crop (int);
+       void set_top_crop (int);
+       void set_bottom_crop (int);
+
+       Crop crop () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _crop;
+       }
+
+       void set_ratio (Ratio const *);
+
+       Ratio const * ratio () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _ratio;
+       }
+
 protected:
        void take_from_video_decoder (boost::shared_ptr<VideoDecoder>);
 
@@ -66,6 +87,8 @@ protected:
 private:
        libdcp::Size _video_size;
        float _video_frame_rate;
+       Crop _crop;
+       Ratio const * _ratio;
 };
 
 #endif