Merge master.

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

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index ce6444293c2fedfbf1f587161aa43a7e9bf6330d..40f758c7423ab855e07ac3991984bfa559eeef1d 100644 (file)
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -43,7 +43,7 @@ public:
        /** @param s Size of data, in bytes */
        EncodedData (int s);
 
-       EncodedData (std::string f);
+       EncodedData (boost::filesystem::path);
 
        virtual ~EncodedData ();
 
@@ -102,7 +102,8 @@ public:
 class DCPVideoFrame : public boost::noncopyable
 {
 public:
-       DCPVideoFrame (boost::shared_ptr<const Image>, int, Eyes, int, int, boost::shared_ptr<Log>);
+       DCPVideoFrame (boost::shared_ptr<const Image>, int, Eyes, ColourConversion, int, int, Resolution, boost::shared_ptr<Log>);
+       DCPVideoFrame (boost::shared_ptr<const Image>, boost::shared_ptr<const cxml::Node>, boost::shared_ptr<Log>);
 
        boost::shared_ptr<EncodedData> encode_locally ();
        boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);
@@ -116,11 +117,16 @@ public:
        }
        
 private:
+
+       void add_metadata (xmlpp::Element *) const;
+       
        boost::shared_ptr<const Image> _image;
        int _frame;                      ///< frame index within the DCP's intrinsic duration
        Eyes _eyes;
+       ColourConversion _conversion;
        int _frames_per_second;          ///< Frames per second that we will use for the DCP
        int _j2k_bandwidth;              ///< J2K bandwidth to use
+       Resolution _resolution;          ///< Resolution (2K or 4K)
 
        boost::shared_ptr<Log> _log; ///< log
 };