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 bf0b7f8c4614da1237f91adada7e30ba002a907f..7393efde699d1a4ad1f6560c50a102dddcb0eb8e 100644 (file)
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
     Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
 
     This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
 
 */
 
-#include <openjpeg.h>
-#include <libdcp/picture_asset.h>
-#include <libdcp/picture_asset_writer.h>
+#include <dcp/picture_mxf_writer.h>
 #include "util.h"
 
 /** @file  src/dcp_video_frame.h
@@ -33,6 +31,7 @@ class Scaler;
 class Image;
 class Log;
 class Subtitle;
+class PlayerVideoFrame;
 
 /** @class EncodedData
  *  @brief Container for J2K-encoded data.
@@ -43,13 +42,13 @@ public:
        /** @param s Size of data, in bytes */
        EncodedData (int s);
 
-       EncodedData (std::string f);
+       EncodedData (boost::filesystem::path);
 
        virtual ~EncodedData ();
 
        void send (boost::shared_ptr<Socket> socket);
        void write (boost::shared_ptr<const Film>, int, Eyes) const;
-       void write_info (boost::shared_ptr<const Film>, int, Eyes, libdcp::FrameInfo) const;
+       void write_info (boost::shared_ptr<const Film>, int, Eyes, dcp::FrameInfo) const;
 
        /** @return data */
        uint8_t* data () const {
@@ -102,30 +101,27 @@ public:
 class DCPVideoFrame : public boost::noncopyable
 {
 public:
-       DCPVideoFrame (boost::shared_ptr<const Image>, int, Eyes, ColourConversion, int, int, boost::shared_ptr<Log>);
-       DCPVideoFrame (boost::shared_ptr<const Image>, boost::shared_ptr<const cxml::Node>, boost::shared_ptr<Log>);
+       DCPVideoFrame (boost::shared_ptr<const PlayerVideoFrame>, int, int, int, Resolution, boost::shared_ptr<Log>);
+       DCPVideoFrame (boost::shared_ptr<const PlayerVideoFrame>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
 
        boost::shared_ptr<EncodedData> encode_locally ();
        boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);
 
-       Eyes eyes () const {
-               return _eyes;
-       }
-       
-       int frame () const {
-               return _frame;
+       int index () const {
+               return _index;
        }
+
+       Eyes eyes () const;
        
 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;
+       boost::shared_ptr<const PlayerVideoFrame> _frame;
+       int _index;                      ///< frame index within the DCP's intrinsic duration
        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
 };