Merge master.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 44f1c28472c08cc1885a4c021a723b9a6a31bc2b..6b91997c9f4076c91ffdd9d536ee21106bc0e9d0 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,9 +21,9 @@
 #define DCPOMATIC_VIDEO_CONTENT_H
 
 #include "content.h"
-#include "util.h"
+#include "colour_conversion.h"
 
-class VideoDecoder;
+class VideoExaminer;
 class Ratio;
 
 class VideoContentProperty
@@ -31,27 +31,81 @@ class VideoContentProperty
 public:
        static int const VIDEO_SIZE;
        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:
-       VideoContent (boost::shared_ptr<const Film>, Time, ContentVideoFrame);
+       typedef int Frame;
+
+       VideoContent (boost::shared_ptr<const Film>);
+       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 (VideoContent const &);
+       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;
+       std::string technical_summary () const;
        virtual std::string information () const;
+       virtual std::string identifier () const;
 
-       ContentVideoFrame video_length () const {
+       ContentTime video_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_length;
        }
 
-       libdcp::Size video_size () const {
+       ContentTime video_length_after_3d_combine () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
+                       return ContentTime (_video_length.get() / 2);
+               }
+               
+               return _video_length;
+       }
+
+       dcp::Size video_size () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_size;
        }
@@ -61,34 +115,81 @@ public:
                return _video_frame_rate;
        }
 
-       void set_crop (Crop);
+       void set_video_frame_type (VideoFrameType);
+
        void set_left_crop (int);
        void set_right_crop (int);
        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;
+       }
+
        Crop crop () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _crop;
        }
 
-       void set_ratio (Ratio const *);
+       int left_crop () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _crop.left;
+       }
 
-       Ratio const * ratio () const {
+       int right_crop () const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _ratio;
+               return _crop.right;
        }
 
+       int top_crop () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _crop.top;
+       }
+
+       int bottom_crop () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _crop.bottom;
+       }
+
+       /** @return Description of how to scale this content (if indeed it should be scaled) */
+       VideoContentScale scale () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _scale;
+       }
+
+       ColourConversion colour_conversion () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _colour_conversion;
+       }
+
+       dcp::Size video_size_after_3d_split () const;
+       dcp::Size video_size_after_crop () const;
+
+       ContentTime dcp_time_to_content_time (DCPTime) const;
+
 protected:
-       void take_from_video_decoder (boost::shared_ptr<VideoDecoder>);
+       void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-       ContentVideoFrame _video_length;
+       ContentTime _video_length;
+       float _video_frame_rate;
 
 private:
-       libdcp::Size _video_size;
-       float _video_frame_rate;
+       friend class ffmpeg_pts_offset_test;
+       friend class best_dcp_frame_rate_test_single;
+       friend class best_dcp_frame_rate_test_double;
+       friend class audio_sampling_rate_test;
+
+       void setup_default_colour_conversion ();
+       
+       dcp::Size _video_size;
+       VideoFrameType _video_frame_type;
        Crop _crop;
-       Ratio const * _ratio;
+       VideoContentScale _scale;
+       ColourConversion _colour_conversion;
 };
 
 #endif