Merge master; specify libdcp-1.0.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 6e3f8187f3ea4b1afd4ad95853ae8a3aebd3b6b3..1ef1f58b7bb693a76b875f3b30bd79be42d7c057 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -37,7 +37,6 @@ class Playlist;
 class AudioContent;
 class Piece;
 class Image;
-class Resampler;
 
 /** @class PlayerImage
  *  @brief A wrapper for an Image which contains some pending operations; these may
@@ -46,21 +45,53 @@ class Resampler;
 class PlayerImage
 {
 public:
-       PlayerImage (boost::shared_ptr<const Image>, Crop, libdcp::Size, libdcp::Size, Scaler const *);
+       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 ();
+       boost::shared_ptr<Image> image (AVPixelFormat, bool);
 
 private:
        boost::shared_ptr<const Image> _in;
        Crop _crop;
-       libdcp::Size _inter_size;
-       libdcp::Size _out_size;
+       dcp::Size _inter_size;
+       dcp::Size _out_size;
        Scaler const * _scaler;
        boost::shared_ptr<const Image> _subtitle_image;
        Position<int> _subtitle_position;
 };
+
+class PlayerStatistics
+{
+public:
+       struct Video {
+               Video ()
+                       : black (0)
+                       , repeat (0)
+                       , good (0)
+                       , skip (0)
+               {}
+               
+               int black;
+               int repeat;
+               int good;
+               int skip;
+       } video;
+
+       struct Audio {
+               Audio ()
+                       : silence (0)
+                       , good (0)
+                       , skip (0)
+               {}
+               
+               int64_t silence;
+               int64_t good;
+               int64_t skip;
+       } audio;
+
+       void dump (boost::shared_ptr<Log>) const;
+};
  
 /** @class Player
  *  @brief A class which can `play' a Playlist; emitting its audio and video.
@@ -81,10 +112,13 @@ public:
                return _video_position;
        }
 
-       void set_video_container_size (libdcp::Size);
+       void set_video_container_size (dcp::Size);
+       void set_approximate_size ();
 
        bool repeat_last_video ();
 
+       PlayerStatistics const & statistics () const;
+       
        /** Emitted when a video frame is ready.
         *  First parameter is the video image.
         *  Second parameter is the eye(s) that should see this image.
@@ -115,12 +149,13 @@ private:
        void do_seek (DCPTime, bool);
        void flush ();
        void emit_black ();
-       void emit_silence (OutputAudioFrame);
-       boost::shared_ptr<Resampler> resampler (boost::shared_ptr<AudioContent>, bool);
+       void emit_silence (AudioFrame);
        void film_changed (Film::Property);
-       void update_subtitle ();
+       void update_subtitle_from_image ();
+       void update_subtitle_from_text ();
        void emit_video (boost::weak_ptr<Piece>, boost::shared_ptr<DecodedVideo>);
        void emit_audio (boost::weak_ptr<Piece>, boost::shared_ptr<DecodedAudio>);
+       void step_video_position (boost::shared_ptr<DecodedVideo>);
 
        boost::shared_ptr<const Film> _film;
        boost::shared_ptr<const Playlist> _playlist;
@@ -137,20 +172,26 @@ private:
        /** The time after the last audio that we emitted */
        DCPTime _audio_position;
 
-       AudioMerger<DCPTime, AudioContent::Frame> _audio_merger;
+       AudioMerger<DCPTime, AudioFrame> _audio_merger;
 
-       libdcp::Size _video_container_size;
+       dcp::Size _video_container_size;
        boost::shared_ptr<PlayerImage> _black_frame;
-       std::map<boost::shared_ptr<AudioContent>, boost::shared_ptr<Resampler> > _resamplers;
 
        struct {
                boost::weak_ptr<Piece> piece;
-               boost::shared_ptr<DecodedSubtitle> subtitle;
-       } _in_subtitle;
+               boost::shared_ptr<DecodedImageSubtitle> subtitle;
+       } _image_subtitle;
 
+       struct {
+               boost::weak_ptr<Piece> piece;
+               boost::shared_ptr<DecodedTextSubtitle> subtitle;
+       } _text_subtitle;
+       
        struct {
                Position<int> position;
-               boost::shared_ptr<DecodedSubtitle> subtitle;
+               boost::shared_ptr<Image> image;
+               DCPTime from;
+               DCPTime to;
        } _out_subtitle;
 
 #ifdef DCPOMATIC_DEBUG
@@ -165,6 +206,9 @@ private:
        } _last_incoming_video;
 
        bool _just_did_inaccurate_seek;
+       bool _approximate_size;
+
+       PlayerStatistics _statistics;
 
        boost::signals2::scoped_connection _playlist_changed_connection;
        boost::signals2::scoped_connection _playlist_content_changed_connection;