X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_video.h;h=81ddc4470c9e748f81289262a3da382eae11ee68;hp=8fd668b00dc7402a016a171b5967b54dcded8fa8;hb=HEAD;hpb=5ce9c7026366d82233e8852b9b949362ed2f6191

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 8fd668b00..bf95ccfe6 100644
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -1,38 +1,39 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
-    Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "util.h"
-#include <dcp/picture_asset_writer.h>
+
+#include "encode_server_description.h"
+#include "resolution.h"
 #include <libcxml/cxml.h>
+#include <dcp/array_data.h>
+#include <dcp/openjpeg_image.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.
@@ -43,14 +44,17 @@ class Data;
  *  Objects of this class are used for the queue that we keep
  *  of images that require encoding.
  */
-class DCPVideo : public boost::noncopyable
+class DCPVideo
 {
 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>);
+	DCPVideo (std::shared_ptr<const PlayerVideo>, int index, int dcp_fps, int bandwidth, Resolution r);
+	DCPVideo (std::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr);
+
+	DCPVideo (DCPVideo const&) = default;
+	DCPVideo& operator= (DCPVideo const&) = default;
 
-	Data encode_locally (dcp::NoteHandler note);
-	Data encode_remotely (ServerDescription);
+	dcp::ArrayData encode_locally () const;
+	dcp::ArrayData encode_remotely (EncodeServerDescription, int timeout = 30) const;
 
 	int index () const {
 		return _index;
@@ -58,17 +62,17 @@ public:
 
 	Eyes eyes () const;
 
-	bool same (boost::shared_ptr<const DCPVideo> other) const;
+	bool same (std::shared_ptr<const DCPVideo> other) const;
+
+	static std::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz(std::shared_ptr<const PlayerVideo> frame);
 
 private:
 
 	void add_metadata (xmlpp::Element *) const;
 
-	boost::shared_ptr<const PlayerVideo> _frame;
+	std::shared_ptr<const PlayerVideo> _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
 };