Use libdcp's compress_j2k; move Data into libdcp.

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

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 8fd668b00dc7402a016a171b5967b54dcded8fa8..995ceb5479244c1079ed93f975d5c129ff48c2ba 100644 (file)
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -18,21 +18,17 @@
 
 */
 
-#include "util.h"
-#include <dcp/picture_asset_writer.h>
+#include "types.h"
+#include "server_description.h"
 #include <libcxml/cxml.h>
+#include <dcp/data.h>
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
  */
 
-class ServerDescription;
-class Scaler;
-class Image;
 class Log;
-class Subtitle;
 class PlayerVideo;
-class Data;
 
 /** @class DCPVideo
  *  @brief A single frame of video destined for a DCP.
@@ -49,8 +45,8 @@ public:
        DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, boost::shared_ptr<Log>);
        DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
 
-       Data encode_locally (dcp::NoteHandler note);
-       Data encode_remotely (ServerDescription);
+       dcp::Data encode_locally (dcp::NoteHandler note);
+       dcp::Data encode_remotely (ServerDescription);
 
        int index () const {
                return _index;
@@ -60,6 +56,8 @@ public:
 
        bool same (boost::shared_ptr<const DCPVideo> other) const;
 
+       static boost::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz (boost::shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note);
+
 private:
 
        void add_metadata (xmlpp::Element *) const;