X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=e99c345bb211ea99d683fcb5b3d32513305ad4c9;hb=0486d4d94900c7f2a2cab7885b3f162d1ad8290c;hp=70a2e4ae36614c8e42216fb0221735d7c0193ee1;hpb=1db0293ad36605da9ca8daa8736ef581f4f6a34e;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index 70a2e4ae3..e99c345bb 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -41,9 +41,12 @@ namespace dcp { class ReelAsset; } +namespace dcpomatic { + class Font; +} + class PlayerVideo; class Playlist; -class Font; class AudioBuffers; class ReferencedReelAsset; class Shuffler; @@ -68,9 +71,9 @@ public: ~Player (); bool pass (); - void seek (DCPTime time, bool accurate); + void seek (dcpomatic::DCPTime time, bool accurate); - std::list > get_subtitle_fonts (); + std::list > get_subtitle_fonts (); std::list get_reel_assets (); dcp::Size video_container_size () const { boost::mutex::scoped_lock lm (_mutex); @@ -86,20 +89,17 @@ 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::optional content_time_to_dcp (boost::shared_ptr content, dcpomatic::ContentTime t); boost::signals2::signal Change; - /** The change suggested by a MayChange did not happen */ - boost::signals2::signal NotChanged; - /** 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, DCPTimePeriod)> Text; + boost::signals2::signal, dcpomatic::DCPTimePeriod)> Text; private: friend class PlayerWrapper; @@ -108,6 +108,9 @@ 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 setup_pieces (); void setup_pieces_unlocked (); @@ -115,28 +118,27 @@ private: void film_change (ChangeType, Film::Property); void playlist_change (ChangeType); void playlist_content_change (ChangeType, int, bool); - 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; + Frame dcp_to_content_video (boost::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime content_video_to_dcp (boost::shared_ptr piece, Frame f) const; + Frame dcp_to_resampled_audio (boost::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime resampled_audio_to_dcp (boost::shared_ptr piece, Frame f) const; + dcpomatic::ContentTime dcp_to_content_time (boost::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime content_time_to_dcp (boost::shared_ptr piece, dcpomatic::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); - 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 subtitle_stop (boost::weak_ptr, boost::weak_ptr, dcpomatic::ContentTime); + dcpomatic::DCPTime one_video_frame () const; + void fill_audio (dcpomatic::DCPTimePeriod period); + std::pair, dcpomatic::DCPTime> discard_audio ( + boost::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 (boost::shared_ptr pv, dcpomatic::DCPTime time); + void do_emit_video (boost::shared_ptr pv, dcpomatic::DCPTime time); + void emit_audio (boost::shared_ptr data, dcpomatic::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 @@ -147,7 +149,7 @@ private: boost::shared_ptr _film; boost::shared_ptr _playlist; - /** true if we are suspended (i.e. pass() and seek() do nothing */ + /** true if we are suspended (i.e. pass() and seek() do nothing) */ bool _suspended; std::list > _pieces; @@ -163,14 +165,16 @@ private: bool _always_burn_open_subtitles; /** true if we should try to be fast rather than high quality */ bool _fast; + /** true if we should keep going in the face of `survivable' errors */ + bool _tolerant; /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ bool _play_referenced; /** 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; @@ -179,20 +183,20 @@ private: AudioMerger _audio_merger; Shuffler* _shuffler; - std::list, DCPTime> > _delay; + std::list, dcpomatic::DCPTime> > _delay; class StreamState { public: StreamState () {} - StreamState (boost::shared_ptr p, DCPTime l) + StreamState (boost::shared_ptr p, dcpomatic::DCPTime l) : piece(p) , last_push_end(l) {} boost::shared_ptr piece; - DCPTime last_push_end; + dcpomatic::DCPTime last_push_end; }; std::map _stream_states;