X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=d16666bc51a4394bd92f49c7cd4fc442f6eca118;hb=de522946acfd022b5084434fbcfd225499a17293;hp=0b0c9facdf4eeaa2184034f18196d54f9d074565;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index 0b0c9facd..d16666bc5 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -18,40 +18,40 @@ */ + #ifndef DCPOMATIC_PLAYER_H #define DCPOMATIC_PLAYER_H -#include "atmos_metadata.h" -#include "player_text.h" + #include "active_text.h" -#include "content_text.h" -#include "film.h" -#include "content.h" +#include "atmos_metadata.h" +#include "audio_merger.h" +#include "audio_stream.h" #include "content_atmos.h" -#include "position_image.h" -#include "piece.h" -#include "content_video.h" #include "content_audio.h" -#include "audio_stream.h" -#include "audio_merger.h" +#include "content_text.h" +#include "content_video.h" #include "empty.h" +#include "film.h" +#include "image.h" +#include "player_text.h" +#include "position_image.h" +#include "shuffler.h" #include #include + namespace dcp { class ReelAsset; } -namespace dcpomatic { - class FontData; -} - class AtmosContent; +class AudioBuffers; +class Content; class PlayerVideo; class Playlist; -class AudioBuffers; class ReferencedReelAsset; -class Shuffler; + class PlayerProperty { @@ -64,20 +64,23 @@ public: static int const PLAYBACK_LENGTH; }; + /** @class Player * @brief A class which can play a Playlist. */ -class Player : public std::enable_shared_from_this, public boost::noncopyable +class Player : public std::enable_shared_from_this { public: - Player (std::shared_ptr); + Player (std::shared_ptr, Image::Alignment subtitle_alignment); Player (std::shared_ptr, std::shared_ptr playlist); - ~Player (); + + Player (Player const& Player) = delete; + Player& operator= (Player const& Player) = delete; bool pass (); void seek (dcpomatic::DCPTime time, bool accurate); - std::vector get_subtitle_fonts (); + std::vector> get_subtitle_fonts (); std::list get_reel_assets (); dcp::Size video_container_size () const { boost::mutex::scoped_lock lm (_mutex); @@ -93,12 +96,16 @@ public: void set_play_referenced (); void set_dcp_decode_reduction (boost::optional reduction); - boost::optional content_time_to_dcp (std::shared_ptr content, dcpomatic::ContentTime t); + boost::optional content_time_to_dcp (std::shared_ptr content, dcpomatic::ContentTime t); + boost::optional dcp_to_content_time (std::shared_ptr content, dcpomatic::DCPTime t); boost::signals2::signal Change; /** Emitted when a video frame is ready. These emissions happen in the correct order. */ boost::signals2::signal, dcpomatic::DCPTime)> Video; + /** Emitted when audio data is ready. First parameter is the audio data, second its time, + * third the frame rate. + */ boost::signals2::signal, dcpomatic::DCPTime, int)> Audio; /** Emitted when a text is ready. This signal may be emitted considerably * after the corresponding Video. @@ -116,11 +123,11 @@ private: friend struct empty_test1; friend struct empty_test2; friend struct check_reuse_old_data_test; + friend struct overlap_video_test1; void construct (); void setup_pieces (); void setup_pieces_unlocked (); - void flush (); void film_change (ChangeType, Film::Property); void playlist_change (ChangeType); void playlist_content_change (ChangeType, int, bool); @@ -156,13 +163,13 @@ private: */ mutable boost::mutex _mutex; - std::shared_ptr _film; + std::shared_ptr const _film; /** Playlist, or 0 if we are using the one from the _film */ - std::shared_ptr _playlist; + std::shared_ptr const _playlist; /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */ boost::atomic _suspended; - std::list > _pieces; + std::list> _pieces; /** Size of the image we are rendering to; this may be the DCP frame size, or * the size of preview in a window. @@ -171,23 +178,24 @@ private: std::shared_ptr _black_image; /** true if the player should ignore all video; i.e. never produce any */ - bool _ignore_video = false; - bool _ignore_audio = false; + boost::atomic _ignore_video; + boost::atomic _ignore_audio; /** true if the player should ignore all text; i.e. never produce any */ - bool _ignore_text = false; - bool _always_burn_open_subtitles = false; + boost::atomic _ignore_text; + boost::atomic _always_burn_open_subtitles; /** true if we should try to be fast rather than high quality */ - bool _fast = false; + boost::atomic _fast; /** true if we should keep going in the face of `survivable' errors */ - bool _tolerant = false; + bool const _tolerant; /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ bool _play_referenced = false; - /** Time just after the last video frame we emitted, or the time of the last accurate seek */ - boost::optional _last_video_time; - boost::optional _last_video_eyes; - /** Time just after the last audio frame we emitted, or the time of the last accurate seek */ - boost::optional _last_audio_time; + /** Time of the next video that we will emit, or the time of the last accurate seek */ + boost::optional _next_video_time; + /** Eyes of the next video that we will emit */ + boost::optional _next_video_eyes; + /** Time of the next audio that we will emit, or the time of the last accurate seek */ + boost::optional _next_audio_time; boost::optional _dcp_decode_reduction; @@ -195,8 +203,8 @@ private: LastVideoMap _last_video; AudioMerger _audio_merger; - Shuffler* _shuffler = nullptr; - std::list, dcpomatic::DCPTime> > _delay; + std::unique_ptr _shuffler; + std::list, dcpomatic::DCPTime>> _delay; class StreamState { @@ -221,9 +229,13 @@ private: dcpomatic::DCPTime _playback_length; + /** Alignment for subtitle images that we create */ + Image::Alignment const _subtitle_alignment = Image::Alignment::PADDED; + boost::signals2::scoped_connection _film_changed_connection; boost::signals2::scoped_connection _playlist_change_connection; boost::signals2::scoped_connection _playlist_content_change_connection; }; + #endif