X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=fe7ae384e13114bb171c703b6d47804f305c1d03;hb=1a0aeb9b5639f31dc50e4a2c72c4dc33899a7d4a;hp=7d27877837bc835ef0bba256ed7cd24bde4d6e0f;hpb=6f071ce94bb7cff1106e2ef6d8eb4363694435f2;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 7d2787783..fe7ae384e 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -1,33 +1,39 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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 <boost/shared_ptr.hpp>
+#ifndef DCPOMATIC_PLAYER_VIDEO_H
+#define DCPOMATIC_PLAYER_VIDEO_H
+
 #include "types.h"
 #include "position.h"
+#include "dcpomatic_time.h"
 #include "colour_conversion.h"
 #include "position_image.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include <boost/shared_ptr.hpp>
 
 class Image;
 class ImageProxy;
-class Scaler;
 class Socket;
-class Log;
 
 /** Everything needed to describe a video frame coming out of the player, but with the
  *  bits still their raw form.  We may want to combine the bits on a remote machine,
@@ -36,37 +42,67 @@ class Log;
 class PlayerVideo
 {
 public:
-	PlayerVideo (boost::shared_ptr<const ImageProxy>, DCPTime, Crop, dcp::Size, dcp::Size, Scaler const *, Eyes, Part, ColourConversion);
-	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
+	PlayerVideo (
+		boost::shared_ptr<const ImageProxy>,
+		Crop,
+		boost::optional<double>,
+		dcp::Size,
+		dcp::Size,
+		Eyes,
+		Part,
+		boost::optional<ColourConversion>
+		);
+
+	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
 
 	void set_subtitle (PositionImage);
-	
-	boost::shared_ptr<Image> image () const;
+
+	void prepare ();
+	boost::shared_ptr<Image> image (dcp::NoteHandler note, boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
+
+	static AVPixelFormat always_rgb (AVPixelFormat);
+	static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
 
 	void add_metadata (xmlpp::Node* node) const;
 	void send_binary (boost::shared_ptr<Socket> socket) const;
 
-	DCPTime time () const {
-		return _time;
-	}
+	bool has_j2k () const;
+	dcp::Data j2k () const;
 
 	Eyes eyes () const {
 		return _eyes;
 	}
 
-	ColourConversion colour_conversion () const {
+	void set_eyes (Eyes e) {
+		_eyes = e;
+	}
+
+	boost::optional<ColourConversion> colour_conversion () const {
 		return _colour_conversion;
 	}
 
+	/** @return Position of the content within the overall image once it has been scaled up */
+	Position<int> inter_position () const;
+
+	/** @return Size of the content within the overall image once it has been scaled up */
+	dcp::Size inter_size () const {
+		return _inter_size;
+	}
+
+	bool same (boost::shared_ptr<const PlayerVideo> other) const;
+
+	size_t memory_used () const;
+
 private:
 	boost::shared_ptr<const ImageProxy> _in;
-	DCPTime _time;
 	Crop _crop;
+	boost::optional<double> _fade;
 	dcp::Size _inter_size;
 	dcp::Size _out_size;
-	Scaler const * _scaler;
 	Eyes _eyes;
 	Part _part;
-	ColourConversion _colour_conversion;
-	PositionImage _subtitle;
+	boost::optional<ColourConversion> _colour_conversion;
+	boost::optional<PositionImage> _subtitle;
 };
+
+#endif