X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=52dffec24656a1edadcefab42756ea73bb6844d2;hb=9facdf75a2776319fc5826cfa3dd85340f3c8879;hp=e47cf53a1f00df21baed32027d65c50d675cee47;hpb=2f61270d2726445f562efc0e4b33fa19ba235183;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index e47cf53a1..52dffec24 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -20,9 +20,6 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include "playlist.h"
 #include "content.h"
 #include "film.h"
@@ -33,6 +30,10 @@
 #include "position_image.h"
 #include "piece.h"
 #include "content_video.h"
+#include "player_subtitles.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <list>
 
 class Job;
 class Film;
@@ -40,9 +41,11 @@ class Playlist;
 class AudioContent;
 class Piece;
 class Image;
-class DCPVideo;
 class Decoder;
-
+class Resampler;
+class PlayerVideo;
+class ImageProxy;
+ 
 class PlayerStatistics
 {
 public:
@@ -75,29 +78,6 @@ public:
 	void dump (boost::shared_ptr<Log>) const;
 };
 
-/** @class PlayerImage
- *  @brief A wrapper for an Image which contains some pending operations; these may
- *  not be necessary if the receiver of the PlayerImage throws it away.
- */
-class PlayerImage
-{
-public:
-	PlayerImage (boost::shared_ptr<const Image>, Crop, dcp::Size, dcp::Size, Scaler const *);
-
-	void set_subtitle (boost::shared_ptr<const Image>, Position<int>);
-	
-	boost::shared_ptr<Image> image ();
-	
-private:
-	boost::shared_ptr<const Image> _in;
-	Crop _crop;
-	dcp::Size _inter_size;
-	dcp::Size _out_size;
-	Scaler const * _scaler;
-	boost::shared_ptr<const Image> _subtitle_image;
-	Position<int> _subtitle_position;
-};
-
 /** @class Player
  *  @brief A class which can `play' a Playlist.
  */
@@ -106,14 +86,15 @@ class Player : public boost::enable_shared_from_this<Player>, public boost::nonc
 public:
 	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
 
-	std::list<boost::shared_ptr<DCPVideo> > get_video (DCPTime time, bool accurate);
+	std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate);
 	boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
+	PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting);
+	std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
 
 	void set_video_container_size (dcp::Size);
-	void set_approximate_size ();
-	void set_burn_subtitles (bool burn) {
-		_burn_subtitles = burn;
-	}
+	void set_ignore_video ();
+	void set_enable_subtitles (bool enable);
+	void set_burn_subtitles (bool burn);
 
 	PlayerStatistics const & statistics () const;
 	
@@ -128,29 +109,20 @@ public:
 private:
 	friend class PlayerWrapper;
 	friend class Piece;
-	friend class player_overlaps_test;
+	friend struct player_overlaps_test;
 
 	void setup_pieces ();
 	void playlist_changed ();
 	void content_changed (boost::weak_ptr<Content>, int, bool);
 	void flush ();
 	void film_changed (Film::Property);
-	std::list<PositionImage> process_content_image_subtitles (
-		boost::shared_ptr<SubtitleContent>, std::list<boost::shared_ptr<ContentImageSubtitle> >
-		) const;
-	std::list<PositionImage> process_content_text_subtitles (std::list<boost::shared_ptr<ContentTextSubtitle> >) const;
+	std::list<PositionImage> transform_image_subtitles (std::list<ImageSubtitle>) const;
 	void update_subtitle_from_text ();
-	VideoFrame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-	AudioFrame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
+	Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
+	DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
+	Frame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
 	ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-	boost::shared_ptr<DCPVideo> black_dcp_video (DCPTime) const;
-	boost::shared_ptr<DCPVideo> content_to_dcp (
-		boost::shared_ptr<VideoContent> content,
-		ContentVideo content_video,
-		std::list<boost::shared_ptr<Piece> > subs,
-		DCPTime time,
-		dcp::Size image_size
-		) const;
+	boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const;
 
 	/** @return Pieces of content type C that overlap a specified time range in the DCP */
 	template<class C>
@@ -182,12 +154,17 @@ private:
 	bool _have_valid_pieces;
 	std::list<boost::shared_ptr<Piece> > _pieces;
 
+	/** Size of the image in the DCP (e.g. 1990x1080 for flat) */
 	dcp::Size _video_container_size;
 	boost::shared_ptr<Image> _black_image;
 
-	bool _approximate_size;
+	/** true if the player should ignore all video; i.e. never produce any */
+	bool _ignore_video;
+	/** true if the player should burn subtitles into the video */
 	bool _burn_subtitles;
 
+	boost::shared_ptr<AudioProcessor> _audio_processor;
+
 	PlayerStatistics _statistics;
 
 	boost::signals2::scoped_connection _playlist_changed_connection;