Merge master.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 96572bbd9adff2dbfc22c233e67bf49c48ba4b47..d2b19480f056f1895ab722d1ee50a96ee1989d37 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -33,19 +33,57 @@ public:
        static int const VIDEO_FRAME_RATE;
        static int const VIDEO_FRAME_TYPE;
        static int const VIDEO_CROP;
-       static int const VIDEO_RATIO;
+       static int const VIDEO_SCALE;
        static int const COLOUR_CONVERSION;
 };
 
+class VideoContentScale
+{
+public:
+       VideoContentScale ();
+       VideoContentScale (Ratio const *);
+       VideoContentScale (bool);
+       VideoContentScale (boost::shared_ptr<cxml::Node>);
+
+       dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size) const;
+       std::string id () const;
+       std::string name () const;
+       void as_xml (xmlpp::Node *) const;
+
+       Ratio const * ratio () const {
+               return _ratio;
+       }
+
+       bool scale () const {
+               return _scale;
+       }
+
+       static void setup_scales ();
+       static std::vector<VideoContentScale> all () {
+               return _scales;
+       }
+
+private:
+       /** a ratio to stretch the content to, or 0 for no stretch */
+       Ratio const * _ratio;
+       /** true if we want to scale the content */
+       bool _scale;
+
+       static std::vector<VideoContentScale> _scales;
+};
+
+bool operator== (VideoContentScale const & a, VideoContentScale const & b);
+bool operator!= (VideoContentScale const & a, VideoContentScale const & b);
+
 class VideoContent : public virtual Content
 {
 public:
        typedef int Frame;
 
        VideoContent (boost::shared_ptr<const Film>);
-       VideoContent (boost::shared_ptr<const Film>, DCPTime, VideoFrame);
+       VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
        VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-       VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+       VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
        VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
        void as_xml (xmlpp::Node *) const;
@@ -53,7 +91,7 @@ public:
        virtual std::string information () const;
        virtual std::string identifier () const;
 
-       VideoFrame video_length () const {
+       ContentTime video_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_length;
        }
@@ -75,8 +113,9 @@ public:
        void set_top_crop (int);
        void set_bottom_crop (int);
 
+       void set_scale (VideoContentScale);
        void set_colour_conversion (ColourConversion);
-
+       
        VideoFrameType video_frame_type () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_frame_type;
@@ -106,13 +145,11 @@ public:
                boost::mutex::scoped_lock lm (_mutex);
                return _crop.bottom;
        }
-       
-       void set_ratio (Ratio const *);
 
-       /** @return ratio to scale to, or 0 if the content's own ratio should be preserved. */
-       Ratio const * ratio () const {
+       /** @return Description of how to scale this content (if indeed it should be scaled) */
+       VideoContentScale scale () const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _ratio;
+               return _scale;
        }
 
        ColourConversion colour_conversion () const {
@@ -123,12 +160,12 @@ public:
        dcp::Size video_size_after_3d_split () const;
        dcp::Size video_size_after_crop () const;
 
-       VideoFrame time_to_content_video_frames (DCPTime) const;
+       ContentTime dcp_time_to_content_time (DCPTime) const;
 
 protected:
        void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-       VideoFrame _video_length;
+       ContentTime _video_length;
        float _video_frame_rate;
 
 private:
@@ -142,7 +179,7 @@ private:
        dcp::Size _video_size;
        VideoFrameType _video_frame_type;
        Crop _crop;
-       Ratio const * _ratio;
+       VideoContentScale _scale;
        ColourConversion _colour_conversion;
 };