X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=ce49af14848e8d5aa8a7be8121ac67a011b08da0;hp=c43cfd40e1eca4d0dc0b154c8aeb71089475c8bc;hb=39fce9acb7869c551fded172aa070d75c7a9bc50;hpb=1fe6bd7f8ba059322b8357b2210f0fd590567ce2 diff --git a/src/lib/player.h b/src/lib/player.h index c43cfd40e..ce49af148 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -21,11 +21,13 @@ #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 "content_atmos.h" #include "position_image.h" #include "piece.h" #include "content_video.h" @@ -33,17 +35,20 @@ #include "audio_stream.h" #include "audio_merger.h" #include "empty.h" -#include -#include +#include #include namespace dcp { class ReelAsset; } +namespace dcpomatic { + class FontData; +} + +class AtmosContent; class PlayerVideo; class Playlist; -class Font; class AudioBuffers; class ReferencedReelAsset; class Shuffler; @@ -56,21 +61,25 @@ public: static int const FILM_CONTAINER; static int const FILM_VIDEO_FRAME_RATE; static int const DCP_DECODE_REDUCTION; + static int const PLAYBACK_LENGTH; }; /** @class Player * @brief A class which can play a Playlist. */ -class Player : public boost::enable_shared_from_this, public boost::noncopyable +class Player : public std::enable_shared_from_this { public: - Player (boost::shared_ptr, boost::shared_ptr playlist); + Player (std::shared_ptr); + Player (std::shared_ptr, std::shared_ptr playlist); ~Player (); + Player (Player const& Player) = delete; + Player& operator= (Player const& Player) = delete; bool pass (); - void seek (DCPTime time, bool accurate); + void seek (dcpomatic::DCPTime time, bool accurate); - std::list > 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); @@ -86,27 +95,18 @@ public: void set_play_referenced (); void set_dcp_decode_reduction (boost::optional reduction); - boost::optional content_time_to_dcp (boost::shared_ptr content, ContentTime t); - - boost::signals2::signal MayChange; + boost::optional content_time_to_dcp (std::shared_ptr content, dcpomatic::ContentTime t); - /** 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 first parameter is what changed. - * The second parameter is true if these signals are currently likely to be frequent. - */ - boost::signals2::signal Changed; - boost::signals2::signal NotChanged; + 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; + boost::signals2::signal, dcpomatic::DCPTime)> Video; + boost::signals2::signal, dcpomatic::DCPTime, int)> Audio; /** Emitted when a text is ready. This signal may be emitted considerably * after the corresponding Video. */ - boost::signals2::signal Text; + boost::signals2::signal, dcpomatic::DCPTimePeriod)> Text; + boost::signals2::signal, dcpomatic::DCPTime, AtmosMetadata)> Atmos; private: friend class PlayerWrapper; @@ -115,37 +115,42 @@ private: 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; + friend struct check_reuse_old_data_test; + void construct (); void setup_pieces (); void setup_pieces_unlocked (); void flush (); - void film_changed (Film::Property); - void playlist_changed (); - void playlist_content_may_change (); - void playlist_content_changed (boost::weak_ptr, int, bool); - void playlist_content_not_changed (); - std::list transform_bitmap_texts (std::list) 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_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 (Eyes eyes) const; - void video (boost::weak_ptr, ContentVideo); - void audio (boost::weak_ptr, AudioStreamPtr, ContentAudio); - 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, TextType); - DCPTime one_video_frame () const; - void fill_audio (DCPTimePeriod period); - std::pair, DCPTime> discard_audio ( - boost::shared_ptr audio, DCPTime time, DCPTime discard_to + void film_change (ChangeType, Film::Property); + void playlist_change (ChangeType); + void playlist_content_change (ChangeType, int, bool); + Frame dcp_to_content_video (std::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime content_video_to_dcp (std::shared_ptr piece, Frame f) const; + Frame dcp_to_resampled_audio (std::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime resampled_audio_to_dcp (std::shared_ptr piece, Frame f) const; + 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; + + void video (std::weak_ptr, ContentVideo); + void audio (std::weak_ptr, AudioStreamPtr, ContentAudio); + void bitmap_text_start (std::weak_ptr, std::weak_ptr, ContentBitmapText); + void plain_text_start (std::weak_ptr, std::weak_ptr, ContentStringText); + void subtitle_stop (std::weak_ptr, std::weak_ptr, dcpomatic::ContentTime); + void atmos (std::weak_ptr, ContentAtmos); + + dcpomatic::DCPTime one_video_frame () const; + void fill_audio (dcpomatic::DCPTimePeriod period); + std::pair, dcpomatic::DCPTime> discard_audio ( + std::shared_ptr audio, dcpomatic::DCPTime time, dcpomatic::DCPTime discard_to ) 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); + boost::optional open_subtitles_for_frame (dcpomatic::DCPTime time) const; + void emit_video (std::shared_ptr pv, dcpomatic::DCPTime time); + void do_emit_video (std::shared_ptr pv, dcpomatic::DCPTime time); + 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 seek() and pass() called from the Butler thread and lots of other stuff called @@ -153,69 +158,74 @@ private: */ mutable boost::mutex _mutex; - boost::shared_ptr _film; - boost::shared_ptr _playlist; + std::shared_ptr _film; + /** Playlist, or 0 if we are using the one from the _film */ + std::shared_ptr _playlist; - /** We can pass() and seek() */ - bool _can_run; - std::list > _pieces; + /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */ + boost::atomic _suspended; + std::list > _pieces; - /** Size of the image in the DCP (e.g. 1990x1080 for flat) */ + /** 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::shared_ptr _black_image; + std::shared_ptr _black_image; /** true if the player should ignore all video; i.e. never produce any */ - bool _ignore_video; - bool _ignore_audio; + bool _ignore_video = false; + bool _ignore_audio = false; /** true if the player should ignore all text; i.e. never produce any */ - bool _ignore_text; - bool _always_burn_open_subtitles; + bool _ignore_text = false; + bool _always_burn_open_subtitles = false; /** true if we should try to be fast rather than high quality */ - bool _fast; + bool _fast = false; + /** true if we should keep going in the face of `survivable' errors */ + bool _tolerant = false; /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ - bool _play_referenced; + 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_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 _last_audio_time; boost::optional _dcp_decode_reduction; - typedef std::map, boost::shared_ptr > LastVideoMap; + typedef std::map, std::shared_ptr, std::owner_less>> LastVideoMap; LastVideoMap _last_video; AudioMerger _audio_merger; - Shuffler* _shuffler; - std::list, DCPTime> > _delay; + Shuffler* _shuffler = nullptr; + std::list, dcpomatic::DCPTime> > _delay; class StreamState { public: StreamState () {} - StreamState (boost::shared_ptr p, DCPTime l) + StreamState (std::shared_ptr p, dcpomatic::DCPTime l) : piece(p) , last_push_end(l) {} - boost::shared_ptr piece; - DCPTime last_push_end; + std::shared_ptr piece; + dcpomatic::DCPTime last_push_end; }; std::map _stream_states; Empty _black; Empty _silent; - ActiveText _active_texts[TEXT_COUNT]; - boost::shared_ptr _audio_processor; + ActiveText _active_texts[static_cast(TextType::COUNT)]; + std::shared_ptr _audio_processor; + + dcpomatic::DCPTime _playback_length; boost::signals2::scoped_connection _film_changed_connection; - boost::signals2::scoped_connection _playlist_changed_connection; - boost::signals2::scoped_connection _playlist_content_may_change_connection; - boost::signals2::scoped_connection _playlist_content_changed_connection; - boost::signals2::scoped_connection _playlist_content_not_changed_connection; + boost::signals2::scoped_connection _playlist_change_connection; + boost::signals2::scoped_connection _playlist_content_change_connection; }; #endif