X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=a874fd3b262a0afb28459e7c44cbab31c6c123d0;hp=74e05d1e91b46ea654b31148f7439576d0c065e1;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hpb=f4030653da8f5a0b3daebe640f485b3daf9ef091

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 74e05d1e9..a874fd3b2 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -1,34 +1,41 @@
 /*
-    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>
+#include <boost/weak_ptr.hpp>
 
 class Image;
 class ImageProxy;
-class Scaler;
+class Film;
 class Socket;
-class Log;
-class EncodedData;
 
 /** 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,
@@ -37,28 +44,48 @@ class EncodedData;
 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>,
+		boost::weak_ptr<Content>,
+		boost::optional<Frame>
+		);
 
-	void set_subtitle (PositionImage);
-	
-	boost::shared_ptr<Image> image (bool burn_subtitle) const;
+	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
 
-	void add_metadata (xmlpp::Node* node, bool send_subtitles) const;
-	void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const;
+	boost::shared_ptr<PlayerVideo> shallow_copy () const;
 
-	bool has_j2k () const;
-	boost::shared_ptr<EncodedData> j2k () const;
+	void set_text (PositionImage);
 
-	DCPTime time () const {
-		return _time;
-	}
+	void prepare (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast);
+	boost::shared_ptr<Image> image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
+
+	static AVPixelFormat force (AVPixelFormat, 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 reset_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
+
+	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;
 	}
 
@@ -70,15 +97,35 @@ public:
 		return _inter_size;
 	}
 
+	bool same (boost::shared_ptr<const PlayerVideo> other) const;
+
+	size_t memory_used () const;
+
+	boost::weak_ptr<Content> content () const {
+		return _content;
+	}
+
 private:
+	void make_image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
+
 	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> _text;
+	/** Content that we came from.  This is so that reset_metadata() can work, and also
+	 *  for variant:swaroop's non-skippable ads.
+	 */
+	boost::weak_ptr<Content> _content;
+	/** Video frame that we came from.  Again, this is for reset_metadata() */
+	boost::optional<Frame> _video_frame;
+
+	mutable boost::mutex _mutex;
+	mutable boost::shared_ptr<Image> _image;
 };
+
+#endif