X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=0abb02daa96123ed8daa0a21c1ee2d58b8bc8ab1;hb=80f27f81cc7991f52e4a41c7f687681fd9c15a65;hp=9151d20c5ac163d4a1ed882374782af96cd2eb2a;hpb=c98c87afe29d9ef74bdced8a9c96d7752f3fe80f;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index 9151d20c5..0abb02daa 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,10 +20,6 @@ #ifndef DCPOMATIC_PLAYER_H #define DCPOMATIC_PLAYER_H -#include -#include -#include -#include "playlist.h" #include "content.h" #include "film.h" #include "rect.h" @@ -33,15 +29,21 @@ #include "position_image.h" #include "piece.h" #include "content_video.h" +#include "player_subtitles.h" +#include +#include +#include class Job; class Film; -class Playlist; class AudioContent; class Piece; class Image; -class DCPVideo; class Decoder; +class Resampler; +class PlayerVideo; +class ImageProxy; +class Font; class PlayerStatistics { @@ -53,7 +55,7 @@ public: , good (0) , skip (0) {} - + int black; int repeat; int good; @@ -66,7 +68,7 @@ public: , good (0) , skip (0) {} - + DCPTime silence; int64_t good; int64_t skip; @@ -75,47 +77,26 @@ public: void dump (boost::shared_ptr) const; }; -/** 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, dcp::Size, dcp::Size, Scaler const *); - - void set_subtitle (boost::shared_ptr, Position); - - boost::shared_ptr image (); - -private: - boost::shared_ptr _in; - Crop _crop; - dcp::Size _inter_size; - dcp::Size _out_size; - Scaler const * _scaler; - boost::shared_ptr _subtitle_image; - Position _subtitle_position; -}; - /** @class Player * @brief A class which can `play' a Playlist. */ class Player : public boost::enable_shared_from_this, public boost::noncopyable { public: - Player (boost::shared_ptr, boost::shared_ptr); + Player (boost::shared_ptr, boost::shared_ptr playlist); - std::list > get_video (DCPTime time, bool accurate); + std::list > get_video (DCPTime time, bool accurate); boost::shared_ptr get_audio (DCPTime time, DCPTime length, bool accurate); + PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt); + std::list > 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_always_burn_subtitles (bool burn); PlayerStatistics const & statistics () const; - + /** 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 * a seek. @@ -127,29 +108,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, int, bool); void flush (); void film_changed (Film::Property); - std::list process_content_image_subtitles ( - boost::shared_ptr, std::list > - ) const; - std::list process_content_text_subtitles (std::list >) const; + void playlist_changed (); + void playlist_content_changed (boost::weak_ptr, int, bool); + std::list transform_image_subtitles (std::list) const; void update_subtitle_from_text (); - VideoFrame dcp_to_content_video (boost::shared_ptr piece, DCPTime t) const; - AudioFrame dcp_to_content_audio (boost::shared_ptr piece, DCPTime t) const; + Frame dcp_to_content_video (boost::shared_ptr piece, DCPTime t) const; + DCPTime content_video_to_dcp (boost::shared_ptr piece, Frame f) const; + Frame dcp_to_content_audio (boost::shared_ptr piece, DCPTime t) const; ContentTime dcp_to_content_subtitle (boost::shared_ptr piece, DCPTime t) const; - boost::shared_ptr black_dcp_video (DCPTime) const; - boost::shared_ptr content_to_dcp ( - boost::shared_ptr content, - ContentVideo content_video, - std::list > subs, - DCPTime time, - dcp::Size image_size - ) const; + boost::shared_ptr black_player_video_frame (DCPTime) const; /** @return Pieces of content type C that overlap a specified time range in the DCP */ template @@ -170,10 +142,10 @@ private: overlaps.push_back (*i); } } - + return overlaps; } - + boost::shared_ptr _film; boost::shared_ptr _playlist; @@ -181,17 +153,24 @@ private: bool _have_valid_pieces; std::list > _pieces; + /** Size of the image in the DCP (e.g. 1990x1080 for flat) */ dcp::Size _video_container_size; boost::shared_ptr _black_image; - bool _approximate_size; - bool _burn_subtitles; + /** true if the player should ignore all video; i.e. never produce any */ + bool _ignore_video; + /** true if the player should always burn subtitles into the video regardless + of content settings + */ + bool _always_burn_subtitles; + + boost::shared_ptr _audio_processor; PlayerStatistics _statistics; + boost::signals2::scoped_connection _film_changed_connection; boost::signals2::scoped_connection _playlist_changed_connection; boost::signals2::scoped_connection _playlist_content_changed_connection; - boost::signals2::scoped_connection _film_changed_connection; }; #endif