Fix detection of same-frame to speed up simple encodes (#548).

[dcpomatic.git] / src / lib / player.h

diff --git a/src/lib/player.h b/src/lib/player.h
index a3b745c8e4ca69acd641cb106be7b733ca19e7da..52dffec24656a1edadcefab42756ea73bb6844d2 100644 (file)
--- 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"
@@ -34,6 +31,9 @@
 #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;
@@ -89,9 +89,12 @@ public:
        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_ignore_video ();
+       void set_enable_subtitles (bool enable);
+       void set_burn_subtitles (bool burn);
 
        PlayerStatistics const & statistics () const;
        
@@ -115,9 +118,9 @@ private:
        void film_changed (Film::Property);
        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;
-       DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, VideoFrame f) 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<PlayerVideo> black_player_video_frame (DCPTime) const;
 
@@ -151,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;