X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=5017d0e3c8f8bc8a1358d4fcf1d8e75055fd06bf;hb=f679e8ab99d25bcf725732e0c79b658f38a39a27;hp=2a471584bdae8c8b5e2d1465f2f6f2b9ede67748;hpb=aa7edc3114fa3b7868088a9f8f22b5ee195a8668;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 2a471584b..5017d0e3c 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -1,28 +1,31 @@
 /*
     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/>.
 
 */
 
+#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"
-#include "data.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -41,7 +44,6 @@ class PlayerVideo
 public:
 	PlayerVideo (
 		boost::shared_ptr<const ImageProxy>,
-		DCPTime,
 		Crop,
 		boost::optional<double>,
 		dcp::Size,
@@ -55,22 +57,25 @@ public:
 
 	void set_subtitle (PositionImage);
 
-	boost::shared_ptr<Image> image (dcp::NoteHandler note) const;
+	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;
 
 	bool has_j2k () const;
-	Data j2k () const;
-
-	DCPTime time () const {
-		return _time;
-	}
+	dcp::Data j2k () const;
 
 	Eyes eyes () const {
 		return _eyes;
 	}
 
+	void set_eyes (Eyes e) {
+		_eyes = e;
+	}
+
 	boost::optional<ColourConversion> colour_conversion () const {
 		return _colour_conversion;
 	}
@@ -87,7 +92,6 @@ public:
 
 private:
 	boost::shared_ptr<const ImageProxy> _in;
-	DCPTime _time;
 	Crop _crop;
 	boost::optional<double> _fade;
 	dcp::Size _inter_size;
@@ -97,3 +101,5 @@ private:
 	boost::optional<ColourConversion> _colour_conversion;
 	boost::optional<PositionImage> _subtitle;
 };
+
+#endif