X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=22701cb2ca452c486746f643063c7bb7affa1250;hp=18be9d40c8b025770711bac4c4d5737945a75f7b;hb=HEAD;hpb=d41c3bb9ebfb450316e6c79fdf0281ac2e155aa1 diff --git a/src/lib/player.h b/src/lib/player.h index 18be9d40c..48f6f97ca 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -31,8 +31,10 @@ #include "content_audio.h" #include "content_text.h" #include "content_video.h" +#include "dcp_text_track.h" #include "empty.h" -#include "film.h" +#include "enum_indexed_vector.h" +#include "film_property.h" #include "image.h" #include "player_text.h" #include "position_image.h" @@ -48,6 +50,7 @@ namespace dcp { class AtmosContent; class AudioBuffers; class Content; +class Film; class PlayerVideo; class Playlist; class ReferencedReelAsset; @@ -62,28 +65,37 @@ public: static int const FILM_VIDEO_FRAME_RATE; static int const DCP_DECODE_REDUCTION; static int const PLAYBACK_LENGTH; + static int const IGNORE_VIDEO; + static int const IGNORE_AUDIO; + static int const IGNORE_TEXT; + static int const ALWAYS_BURN_OPEN_SUBTITLES; + static int const PLAY_REFERENCED; }; /** @class Player * @brief A class which can play a Playlist. */ -class Player : public std::enable_shared_from_this +class Player { public: Player (std::shared_ptr, Image::Alignment subtitle_alignment); Player (std::shared_ptr, std::shared_ptr playlist); - Player (Player const& Player) = delete; - Player& operator= (Player const& Player) = delete; + Player (Player const&) = delete; + Player& operator= (Player const&) = delete; + + Player(Player&& other); + Player& operator=(Player&& other); bool pass (); void seek (dcpomatic::DCPTime time, bool accurate); + Frame frames_done() const; + float progress() const; std::vector> get_subtitle_fonts (); - std::list get_reel_assets (); + dcp::Size video_container_size () const { - boost::mutex::scoped_lock lm (_mutex); return _video_container_size; } @@ -95,10 +107,17 @@ public: void set_fast (); void set_play_referenced (); void set_dcp_decode_reduction (boost::optional reduction); + void set_disable_audio_processor(); + + boost::optional content_time_to_dcp (std::shared_ptr content, dcpomatic::ContentTime t) const; + boost::optional dcp_to_content_time (std::shared_ptr content, dcpomatic::DCPTime t) const; - 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); + void signal_change(ChangeType type, int property); + /** First parameter is PENDING, DONE or CANCELLED. + * Second parameter is the property. + * Third parameter is true if these signals are currently likely to be frequent. + */ boost::signals2::signal Change; /** Emitted when a video frame is ready. These emissions happen in the correct order. */ @@ -126,9 +145,9 @@ private: friend struct overlap_video_test1; void construct (); + void connect(); void setup_pieces (); - void setup_pieces_unlocked (); - void film_change (ChangeType, Film::Property); + void film_change(ChangeType, FilmProperty); void playlist_change (ChangeType); void playlist_content_change (ChangeType, int, bool); Frame dcp_to_content_video (std::shared_ptr piece, dcpomatic::DCPTime t) const; @@ -138,6 +157,7 @@ private: dcpomatic::ContentTime dcp_to_content_time (std::shared_ptr piece, dcpomatic::DCPTime t) const; dcpomatic::DCPTime content_time_to_dcp (std::shared_ptr piece, dcpomatic::ContentTime t) const; std::shared_ptr black_player_video_frame (Eyes eyes) const; + std::pair, boost::optional> earliest_piece_and_time() const; void video (std::weak_ptr, ContentVideo); void audio (std::weak_ptr, AudioStreamPtr, ContentAudio); @@ -157,24 +177,26 @@ private: void emit_audio (std::shared_ptr data, dcpomatic::DCPTime time); std::shared_ptr playlist () const; - /** Mutex to protect the whole Player state. When it's used for the preview we have + /** Mutex to protect the most of the 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; - std::shared_ptr const _film; + std::weak_ptr _film; /** Playlist, or 0 if we are using the one from the _film */ - std::shared_ptr const _playlist; + std::shared_ptr _playlist; /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */ boost::atomic _suspended; - std::list> _pieces; + std::vector> _pieces; /** Size of the image we are rendering to; this may be the DCP frame size, or * the size of preview in a window. */ - dcp::Size _video_container_size; + boost::atomic _video_container_size; + + mutable boost::mutex _black_image_mutex; std::shared_ptr _black_image; /** true if the player should ignore all video; i.e. never produce any */ @@ -182,13 +204,13 @@ private: boost::atomic _ignore_audio; /** true if the player should ignore all text; i.e. never produce any */ boost::atomic _ignore_text; - bool _always_burn_open_subtitles = false; + 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 const _tolerant; + bool _tolerant; /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ - bool _play_referenced = false; + boost::atomic _play_referenced; /** Time of the next video that we will emit, or the time of the last accurate seek */ boost::optional _next_video_time; @@ -197,7 +219,7 @@ private: /** 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; + boost::atomic> _dcp_decode_reduction; typedef std::map, std::shared_ptr, std::owner_less>> LastVideoMap; LastVideoMap _last_video; @@ -211,26 +233,26 @@ private: public: StreamState () {} - StreamState (std::shared_ptr p, dcpomatic::DCPTime l) + explicit StreamState(std::shared_ptr p) : piece(p) - , last_push_end(l) {} std::shared_ptr piece; - dcpomatic::DCPTime last_push_end; + boost::optional last_push_end; }; std::map _stream_states; Empty _black; Empty _silent; - ActiveText _active_texts[static_cast(TextType::COUNT)]; + EnumIndexedVector _active_texts; std::shared_ptr _audio_processor; + bool _disable_audio_processor = false; - dcpomatic::DCPTime _playback_length; + boost::atomic _playback_length; /** Alignment for subtitle images that we create */ - Image::Alignment const _subtitle_alignment = Image::Alignment::PADDED; + Image::Alignment _subtitle_alignment = Image::Alignment::PADDED; boost::signals2::scoped_connection _film_changed_connection; boost::signals2::scoped_connection _playlist_change_connection;