X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=377e8bd18e5ae3634d4faa0848f19fbcee088082;hb=8353a009aae1a604251c0160193c39741c2fa27c;hp=5f7c2e3694217749d0b7846da747b61bb3c061f7;hpb=d121c9643095514178130b91907cb6f7ba97e74c;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index 5f7c2e369..377e8bd18 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -23,12 +23,14 @@ #include #include #include +#include #include "playlist.h" #include "content.h" #include "film.h" #include "rect.h" #include "audio_merger.h" #include "audio_content.h" +#include "decoded.h" class Job; class Film; @@ -36,23 +38,66 @@ class Playlist; class AudioContent; class Piece; class Image; -class Resampler; -/** @class Player - * @brief A class which can `play' a Playlist; emitting its audio and video. +/** @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, Crop, libdcp::Size, libdcp::Size, Scaler const *); + + void set_subtitle (boost::shared_ptr, Position); + + boost::shared_ptr image (AVPixelFormat, bool); -struct IncomingVideo +private: + boost::shared_ptr _in; + Crop _crop; + libdcp::Size _inter_size; + libdcp::Size _out_size; + Scaler const * _scaler; + boost::shared_ptr _subtitle_image; + Position _subtitle_position; +}; + +class PlayerStatistics { public: - boost::weak_ptr weak_piece; - boost::shared_ptr image; - Eyes eyes; - bool same; - VideoContent::Frame frame; - Time extra; + 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) const; }; +/** @class Player + * @brief A class which can `play' a Playlist; emitting its audio and video. + */ + class Player : public boost::enable_shared_from_this, public boost::noncopyable { public: @@ -62,16 +107,19 @@ public: void disable_audio (); bool pass (); - void seek (Time, bool); + void seek (DCPTime, bool); - Time video_position () const { + DCPTime video_position () const { return _video_position; } void set_video_container_size (libdcp::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. @@ -79,10 +127,10 @@ public: * Fourth parameter is true if the image is the same as the last one that was emitted. * Fifth parameter is the time. */ - boost::signals2::signal, Eyes, ColourConversion, bool, Time)> Video; + boost::signals2::signal, Eyes, ColourConversion, bool, DCPTime)> Video; /** Emitted when some audio data is ready */ - boost::signals2::signal, Time)> Audio; + boost::signals2::signal, DCPTime)> Audio; /** Emitted when something has changed such that if we went back and emitted * the last frame again it would look different. This is not emitted after @@ -96,19 +144,19 @@ private: friend class PlayerWrapper; friend class Piece; - void process_video (boost::weak_ptr, boost::shared_ptr, Eyes, bool, VideoContent::Frame, Time); - void process_audio (boost::weak_ptr, boost::shared_ptr, AudioContent::Frame); - void process_subtitle (boost::weak_ptr, boost::shared_ptr, dcpomatic::Rect, Time, Time); void setup_pieces (); void playlist_changed (); void content_changed (boost::weak_ptr, int, bool); - void do_seek (Time, bool); + void do_seek (DCPTime, bool); void flush (); void emit_black (); - void emit_silence (OutputAudioFrame); - boost::shared_ptr resampler (boost::shared_ptr, 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, boost::shared_ptr); + void emit_audio (boost::weak_ptr, boost::shared_ptr); + void step_video_position (boost::shared_ptr); boost::shared_ptr _film; boost::shared_ptr _playlist; @@ -121,29 +169,30 @@ private: std::list > _pieces; /** The time after the last video that we emitted */ - Time _video_position; + DCPTime _video_position; /** The time after the last audio that we emitted */ - Time _audio_position; + DCPTime _audio_position; - AudioMerger _audio_merger; + AudioMerger _audio_merger; libdcp::Size _video_container_size; - boost::shared_ptr _black_frame; - std::map, boost::shared_ptr > _resamplers; + boost::shared_ptr _black_frame; struct { boost::weak_ptr piece; - boost::shared_ptr image; - dcpomatic::Rect rect; - Time from; - Time to; - } _in_subtitle; + boost::shared_ptr subtitle; + } _image_subtitle; struct { - boost::shared_ptr image; + boost::weak_ptr piece; + boost::shared_ptr subtitle; + } _text_subtitle; + + struct { Position position; - Time from; - Time to; + boost::shared_ptr image; + DCPTime from; + DCPTime to; } _out_subtitle; #ifdef DCPOMATIC_DEBUG @@ -152,7 +201,15 @@ private: bool _last_emit_was_black; - IncomingVideo _last_incoming_video; + struct { + boost::weak_ptr weak_piece; + boost::shared_ptr video; + } _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;