X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.h;h=e4006d98683af8c9ff58e9d0eafc9040686d9c56;hb=8db9e4f88fd3710dd972f0233e6f1b60b691a569;hp=c642fb4db842446ea5a03421d7e9104ce8f1b491;hpb=6543d9a51b31ce24726187d9d1b018f05f09ef40;p=dcpomatic.git

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index c642fb4db..e4006d986 100644
--- 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
@@ -33,6 +33,7 @@ class Scaler;
 class Image;
 class Log;
 class Subtitle;
+class PlayerVideoFrame;
 
 /** @class EncodedData
  *  @brief Container for J2K-encoded data.
@@ -102,30 +103,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>, boost::shared_ptr<const cxml::Node>, 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
 };