X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=b3c4e82b42394453677f886a47b7f7f3899d03f2;hb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;hp=20d9c9388b33fa00464aa06609a836514220571e;hpb=fa4d2529d63bcfa7cf7c516b7227e20a1b6dec7e;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index 20d9c9388..b3c4e82b4 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -21,17 +21,18 @@ #ifndef DCPOMATIC_PLAYER_H #define DCPOMATIC_PLAYER_H -#include "player_subtitles.h" -#include "active_subtitles.h" +#include "player_text.h" +#include "active_text.h" +#include "content_text.h" #include "film.h" #include "content.h" #include "position_image.h" #include "piece.h" #include "content_video.h" #include "content_audio.h" -#include "content_subtitle.h" #include "audio_stream.h" #include "audio_merger.h" +#include "empty.h" #include #include #include @@ -45,41 +46,57 @@ class Playlist; class Font; class AudioBuffers; class ReferencedReelAsset; +class Shuffler; + +class PlayerProperty +{ +public: + static int const VIDEO_CONTAINER_SIZE; + static int const PLAYLIST; + static int const FILM_CONTAINER; + static int const FILM_VIDEO_FRAME_RATE; + static int const DCP_DECODE_REDUCTION; +}; /** @class Player - * @brief A class which can `play' a Playlist. + * @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 playlist); + ~Player (); bool pass (); void seek (DCPTime time, bool accurate); std::list > get_subtitle_fonts (); std::list get_reel_assets (); + dcp::Size video_container_size () const { + boost::mutex::scoped_lock lm (_mutex); + return _video_container_size; + } void set_video_container_size (dcp::Size); void set_ignore_video (); - void set_always_burn_subtitles (bool burn); + void set_ignore_audio (); + void set_ignore_text (); + void set_always_burn_open_subtitles (); void set_fast (); void set_play_referenced (); + void set_dcp_decode_reduction (boost::optional reduction); - /** 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. - * - * The parameter is true if these signals are currently likely to be frequent. - */ - boost::signals2::signal Changed; + boost::optional content_time_to_dcp (boost::shared_ptr content, ContentTime t); + boost::signals2::signal Change; + + /** Emitted when a video frame is ready. These emissions happen in the correct order. */ boost::signals2::signal, DCPTime)> Video; boost::signals2::signal, DCPTime)> Audio; - /** Emitted when a subtitle is ready. This signal may be emitted considerably + /** Emitted when a text is ready. This signal may be emitted considerably * after the corresponding Video. */ - boost::signals2::signal Subtitle; + boost::signals2::signal, DCPTimePeriod)> Text; private: friend class PlayerWrapper; @@ -87,40 +104,49 @@ private: friend struct player_time_calculation_test1; friend struct player_time_calculation_test2; friend struct player_time_calculation_test3; + friend struct player_subframe_test; + friend struct empty_test1; + friend struct empty_test2; void setup_pieces (); + void setup_pieces_unlocked (); void flush (); - void film_changed (Film::Property); - void playlist_changed (); - void playlist_content_changed (boost::weak_ptr, int, bool); - std::list transform_image_subtitles (std::list) const; + void film_change (ChangeType, Film::Property); + void playlist_change (ChangeType); + void playlist_content_change (ChangeType, int, bool); 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_resampled_audio (boost::shared_ptr piece, DCPTime t) const; DCPTime resampled_audio_to_dcp (boost::shared_ptr piece, Frame f) const; ContentTime dcp_to_content_time (boost::shared_ptr piece, DCPTime t) const; DCPTime content_time_to_dcp (boost::shared_ptr piece, ContentTime t) const; - boost::shared_ptr black_player_video_frame () const; + boost::shared_ptr black_player_video_frame (Eyes eyes) const; void video (boost::weak_ptr, ContentVideo); void audio (boost::weak_ptr, AudioStreamPtr, ContentAudio); - void image_subtitle_start (boost::weak_ptr, ContentImageSubtitle); - void text_subtitle_start (boost::weak_ptr, ContentTextSubtitle); - void subtitle_stop (boost::weak_ptr, ContentTime); + void bitmap_text_start (boost::weak_ptr, boost::weak_ptr, ContentBitmapText); + void plain_text_start (boost::weak_ptr, boost::weak_ptr, ContentStringText); + void subtitle_stop (boost::weak_ptr, boost::weak_ptr, ContentTime); DCPTime one_video_frame () const; void fill_audio (DCPTimePeriod period); - void audio_transform (boost::shared_ptr content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time); std::pair, DCPTime> discard_audio ( boost::shared_ptr audio, DCPTime time, DCPTime discard_to ) const; - boost::optional subtitles_for_frame (DCPTime time) const; + boost::optional open_subtitles_for_frame (DCPTime time) const; void emit_video (boost::shared_ptr pv, DCPTime time); + void do_emit_video (boost::shared_ptr pv, DCPTime time); void emit_audio (boost::shared_ptr data, DCPTime time); + /** Mutex to protect the whole Player state. When it's used for the preview we have + seek() and pass() called from the Butler thread and lots of other stuff called + from the GUI thread. + */ + mutable boost::mutex _mutex; + boost::shared_ptr _film; boost::shared_ptr _playlist; - /** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */ - bool _have_valid_pieces; + /** true if we are suspended (i.e. pass() and seek() do nothing) */ + bool _suspended; std::list > _pieces; /** Size of the image in the DCP (e.g. 1990x1080 for flat) */ @@ -129,12 +155,10 @@ private: /** true if the player should ignore all video; i.e. never produce any */ bool _ignore_video; - /** true if the player should ignore all audio; i.e. never produce any */ bool _ignore_audio; - /** true if the player should always burn subtitles into the video regardless - of content settings - */ - bool _always_burn_subtitles; + /** true if the player should ignore all text; i.e. never produce any */ + bool _ignore_text; + bool _always_burn_open_subtitles; /** true if we should try to be fast rather than high quality */ bool _fast; /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ @@ -142,13 +166,18 @@ private: /** 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; + boost::optional _dcp_decode_reduction; + typedef std::map, boost::shared_ptr > LastVideoMap; LastVideoMap _last_video; AudioMerger _audio_merger; + Shuffler* _shuffler; + std::list, DCPTime> > _delay; class StreamState { @@ -165,15 +194,15 @@ private: }; std::map _stream_states; - std::list _no_video; - std::list _no_audio; + Empty _black; + Empty _silent; - ActiveSubtitles _active_subtitles; + ActiveText _active_texts[TEXT_COUNT]; boost::shared_ptr _audio_processor; 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 _playlist_change_connection; + boost::signals2::scoped_connection _playlist_content_change_connection; }; #endif